X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=d84dc6e4eb5c766e89bfac3b2c6f9843063cb87e;hb=fb7cc8015acb927b7e0f3e04f1cb4d01f4d3c808;hp=8bc9e204a81daecf00d95be115c053ac3b12adc2;hpb=67cf5d8c6d79e31be1a6d8ea3ce2fc30053620f0;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 8bc9e20..d84dc6e 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -157,8 +157,8 @@
 
 ;; flycheck
 (require-if-present 'flycheck)
-(if (featurep 'flycheck)
-    (global-flycheck-mode))
+;(if (featurep 'flycheck)
+;    (global-flycheck-mode))
 
 (require-if-present 'flycheck-inline)
 (if (featurep 'flycheck-inline)
@@ -175,6 +175,9 @@
 (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode))
 (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode))
 
+;; hengband-pickpref
+(autoload 'hengband-pickpref-mode "hengband-pickpref-mode" nil t)
+
 ;; jaspace
 (require-if-present 'jaspace)
 
@@ -238,15 +241,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (paren-activate))
 
 ;; elscreen
-(condition-case e
-    (load "elscreen" "ElScreen" t)
-  (file-error
-   (if (equal (cadr e) "Cannot open load file")
-       (message "Warning: feature %s is absent" feature) ; warn and ignore
-     (apply 'signal (car e) (cdr e))))) ; rethrow
+(require-if-present 'elscreen)
+(require-if-present 'elscreen-w3m)
 (if (featurep 'elscreen)
     (elscreen-start))
-(require-if-present 'elscreen-w3m)
 
 ;; undo-tree
 (require-if-present 'undo-tree)
@@ -282,6 +280,13 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 
+;; projectile-mode
+(require-if-present 'projectile)
+(if (featurep 'projectile)
+    (progn
+      (projectile-mode +1)
+      (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)))
+
 ;; protobuf-mode
 (autoload 'protobuf-mode "protobuf-mode")
 (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
@@ -407,7 +412,9 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-ghci)
 
-(load-if-present "~/sandbox/_input-method/haskell-unicode-input-method/haskell-unicode-input-method")
+;(add-hook 'haskell-mode-hook #'flycheck-haskell-setup)
+
+(load-if-present "~/sandbox/_input-method/emacs-haskell-unicode-input-method/haskell-unicode-input-method")
  (add-hook 'haskell-mode-hook
    (lambda () (set-input-method "haskell-unicode")))
 
@@ -717,7 +724,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist
@@ -747,6 +754,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(uniquify-trailing-separator-p t)
  '(vc-cvs-diff-switches (quote ("-u")))
  '(vc-cvs-stay-local nil)
+ '(vc-handled-backends (quote (Git Hg)))
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))
@@ -774,10 +782,12 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold))))
  '(diff-removed ((t (:foreground "gold3" :weight extra-bold))))
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
+ '(font-lock-function-name-face ((t (:foreground "light steel blue" :weight bold))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))
  '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold))))
+ '(org-level-1 ((t (:foreground "pale turquoise"))))
  '(textile-link-face ((t (:foreground "cyan"))))
  '(textile-ol-bullet-face ((t (:foreground "dark orange"))))
  '(textile-ul-bullet-face ((t (:foreground "deep sky blue"))))