X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=11588d5426b272779cac5d23615e262787325e0f;hb=1d190f93f957f140e7d1469f70b7e4bab925c8b2;hp=6418da407b87deca6308fdbcd5c013a955e94034;hpb=4263b7f99f2c5cff9bc5d9eed7ea7bc6a5bddecc;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 6418da4..11588d5 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -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)
 
@@ -203,13 +206,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.
@@ -464,8 +460,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))
@@ -590,6 +586,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)
@@ -721,7 +721,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (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
@@ -751,6 +751,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)))