X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=c54ee01c3143c148a072ce9f16d2a2a05ca656b0;hb=36196fa73573a5839436535a219031b2da14d601;hp=be690294efc78abb8ea9be4b5572b72c42620159;hpb=02fcab9a650e690fc4cfea0a93a71135efba0b5f;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index be69029..c54ee01 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -109,21 +109,14 @@
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
   (let ((host (system-name)))
-    (cond ((equal host "seras")
-           (set-frame-font "Dejavu Sans Mono 11" t))
+    (cond ((equal host "kurumi.cielonegro.org")
+           (set-frame-font "Andale Mono 14"))
 
-          ((equal host "yukari.cielonegro.org")
+          ((equal host "seras")
            (set-frame-font "Dejavu Sans Mono 11" t))
 
-          ((equal host "aria.cielonegro.org")
-           (progn
-             (set-frame-font "Dejavu Sans Mono 13" t)
-             ;; Emacs 24.4.1 somehow gets very slow when the following
-             ;; lines are uncommented.
-             ;;(set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
-             ;;(set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック")
-             ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
-             )))))
+          ((equal host "yukari.cielonegro.org")
+           (set-frame-font "Dejavu Sans Mono 11" t)))))
 
 ;; Setting for Packages --------------------------------------------------------
 (defun require-if-present (feature)
@@ -155,12 +148,19 @@
 ;; ditz
 (require-if-present 'ditz)
 
+;; flycheck
+(require-if-present 'flycheck)
+;(if (featurep 'flycheck)
+;    (global-flycheck-mode))
+
+(require-if-present 'flycheck-inline)
+(if (featurep 'flycheck-inline)
+    (with-eval-after-load 'flycheck
+      (add-hook 'flycheck-mode-hook #'flycheck-inline-mode)))
+
 ;; flyspell
 (require-if-present 'flyspell)
 
-;; jaspace
-(require-if-present 'jaspace)
-
 ;; glsl
 (autoload 'glsl-mode "glsl-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode))
@@ -168,10 +168,26 @@
 (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)
+
+;; pkgdiff
+(add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff")
+(autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t)
+(autoload 'pkgdiff "pkgdiff" "Show differences from a backup file." t)
+
 ;; rust
 (autoload 'rust-mode "rust-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
+(require-if-present 'flycheck-rust)
+(if (featurep 'flycheck-rust)
+    (with-eval-after-load 'rust-mode
+      (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
+
 ;; session
 (require-if-present 'session)
 (if (featurep 'session)
@@ -183,13 +199,6 @@
 ;; midnight
 (require-if-present 'midnight)
 
-;; color-theme
-(require-if-present 'color-theme)
-(if (featurep 'color-theme)
-    (progn
-      (color-theme-initialize)
-      (color-theme-subtle-hacker)))
-
 ;; multi-term
 (autoload 'multi-term "multi-term"
   "Create new term buffer.
@@ -218,15 +227,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)
@@ -262,6 +266,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))
@@ -293,28 +304,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
 
 ;; ECB
 (require-if-present 'ecb-autoloads)
-(let* ((hosts '(("netbsd." .
-                 (("~/sandbox/yxmimeproc" "yxmimeproc")
-                  ("~/sandbox/YxMIME" "YxMIME.pm")
-                  ))
-                ("g1.cuenote.jp" .
-                 (("~/sandbox/MR/engine/libycom" "libycom")
-                  ))
-                ("aria.cielonegro.org" .
-                 (("~/sandbox/_web-app/Rakka"           "Rakka")
-                  ("~/sandbox/_haskell/Lucu"            "Lucu")
-                  ("~/sandbox/_web-app/Kirschbaum"      "Kirschbaum")
-                  ("~/sandbox/_haskell/HsOpenSSL"       "HsOpenSSL")
-                  ("~/sandbox/_haskell/HsHyperEstraier" "HsHyperEstraier")
-                  ("~/sandbox/_haskell/HsSVN"           "HsSVN")
-                  ("~/sandbox/_game/RoRo"               "RoRo")
-                  ("~/sandbox/_haskell/HXT"             "HXT")
-                  ("~/sandbox/_haskell/hxt-compile"     "hxt-compile")
-                  ("~/src/ghc-6.10.1"                   "ghc-6.10.1")
-                  ("~/sandbox/sugar"                    "sugar")
-                  ("~/sandbox/_haskell/dns"             "dns")
-                  ("~/sandbox/_haskell/blackboard-ddns" "blackboard-ddns")
-                  ))))
+(let* ((hosts '( ("yukari.cielonegro.org" .
+                  ( ("~/sandbox/_games/acid-rain" "acid rain")
+                    ("~/sandbox/_games/Natural-Mystic-Shaders" "Natural Mystic")
+                    ))))
        (paths (cdr (assoc (system-name) hosts))))
   (setq ecb-source-path paths))
 
@@ -385,7 +378,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
           ))
 
 ;; Haskell
-(load-if-present "haskell-site-file.el")
+(autoload 'haskell-mode "haskell-mode"
+  "Major mode for editing Haskell scripts." t)
+(autoload 'literate-haskell-mode "haskell-mode"
+  "Major mode for editing literate Haskell scripts." t)
 
 (autoload 'run-haskell "inf-haskell" "" t)
 (autoload 'switch-to-haskell "inf-haskell" "" t)
@@ -402,7 +398,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")))
 
@@ -455,8 +453,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)
 
 ;; migemo
-(require-if-present 'migemo)
-(setq migemo-isearch-enable-p nil)
+;(require-if-present 'migemo)
+;(setq migemo-isearch-enable-p nil)
 
 ;; tiarra-conf
 (setq load-path (cons (expand-file-name "~/sandbox/Tiarra") load-path))
@@ -567,9 +565,6 @@ Will prompt you shell name when you type `C-u' before this command." t)
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(Info-additional-directory-list
-   (quote
-    ("/sw/share/info" "/usr/local/info" "/usr/local/share/info")))
  '(ac-ignore-case nil)
  '(appt-display-format (quote window))
  '(appt-message-warning-time 20)
@@ -584,6 +579,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
  '(csv-align-style (quote auto))
+ '(custom-enabled-themes (quote (gnome2)))
+ '(custom-safe-themes
+   (quote
+    ("64affc3597b4271ba6b0b428777d616cfb20d8f7f147dbd00f1de220b2b59bbf" "06e0662b31a2ae8da5c6b5e9a05b25fabd1dc8dd3c3661ac194201131cafb080" default)))
  '(default-frame-alist
     (quote
      ((tool-bar-lines . 0)
@@ -594,12 +593,12 @@ Will prompt you shell name when you type `C-u' before this command." t)
       (left-fringe))))
  '(ditz-find-issue-directory-automatically-flag t)
  '(ecb-add-path-for-not-matching-files (quote (t)))
- '(ecb-help-info-path "/sw/share/info/ecb.info")
- '(ecb-layout-name "left14")
- '(ecb-options-version "2.32")
+ '(ecb-help-info-path "/usr/pkg/info/ecb.info")
+ '(ecb-layout-name "left7")
+ '(ecb-options-version "2.50")
  '(ecb-show-sources-in-directories-buffer (quote always))
  '(ecb-tip-of-the-day nil)
- '(ecb-tree-buffer-style (quote ascii-guides))
+ '(ecb-tree-buffer-style (quote image))
  '(ecb-windows-width 0.2)
  '(electric-indent-mode nil)
  '(elscreen-display-tab t)
@@ -629,8 +628,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist
    (quote
-    (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page")
-     ("YmirDev" "https://ymirlink:santamo@update.forcast.jp/fcdiv/mwiki/" "PHO" "" "メインページ"))))
+    (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page"))))
  '(mew-field-spec
    (quote
     (("^Resent-\\(From\\|To\\|Cc\\|Date\\)" t mew-face-header-important mew-face-header-important)
@@ -713,7 +711,9 @@ Will prompt you shell name when you type `C-u' before this command." t)
    (quote
     (("gnu" . "https://elpa.gnu.org/packages/")
      ("melpa" . "https://melpa.org/packages/"))))
- '(package-selected-packages (quote (cargo toml-mode rust-mode)))
+ '(package-selected-packages
+   (quote
+    (elscreen-fr color-theme-modern 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
@@ -736,13 +736,14 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(select-enable-clipboard t)
  '(session-use-package t nil (session))
  '(tramp-auto-save-directory "/tmp/tramp-auto-save")
- '(tramp-completion-reread-directory-timeout 2 nil (tramp))
- '(tramp-default-host "localhost" nil (tramp))
- '(tramp-default-method "sshx" nil (tramp))
+ '(tramp-completion-reread-directory-timeout 2)
+ '(tramp-default-host "localhost")
+ '(tramp-default-method "sshx")
  '(uniquify-buffer-name-style (quote forward) nil (uniquify))
  '(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)))
@@ -770,10 +771,13 @@ 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-comment-face ((t (:foreground "white smoke"))))
+ '(font-lock-keyword-face ((t (:foreground "salmon"))))
  '(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"))))