X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=c0e1fec656a344976993c038b8c6a6afdb3e53ce;hb=4e76d108984adbbc11e641176f3e59d6555b35b4;hp=d0c3e17570163053a932a36b8997f35dcda6b25d;hpb=008a01847ee8d056243a00aeacf9e1c3eeb2504a;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index d0c3e17..c0e1fec 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,8 +1,3 @@
-;;;(if (eq system-type 'darwin)
-;;;  (setenv "PATH"
-;;;)   (concat (getenv "path") ":/usr/local/bin:~/bin/")
-;;;  )
-
 
 (setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
 (setq exec-path (append exec-path '("/usr/local/bin")))
@@ -12,17 +7,16 @@
 
 (add-to-list 'load-path "~/.emacs.d/config")
 
-(global-set-key "\C-s" 'isearch-forward-regexp)
-(global-set-key "\C-r" 'isearch-backward-regexp)
 
 (require 'init-base)
+(require 'init-font)
 
 (require 'my-packages)
 
 (require 'init-color-theme)
 ;(require 'init-ido)
 (require 'init-magit)
-;(require 'init-evil)
+(require 'init-evil)
 (require 'init-project)
 (require 'init-ggtags)
 
@@ -118,4 +112,25 @@
 ;(icy-mode 1)
 
 
-(require 'init-org)
+;(require 'init-org)
+;(setq help-window-select t)
+
+
+;;  (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
+;;  (autoload 'eim-use-package "eim" "Another emacs input method")
+;;
+;;  (register-input-method
+;;   "eim-wb" "euc-cn" 'eim-use-package
+;;   "五笔" "汉字五笔输入法" "~/.emacs.d/site-lisp/eim/wb.txt")
+;;  (register-input-method
+;;   "eim-py" "euc-cn" 'eim-use-package
+;;   "拼音" "汉字拼音输入法" "~/.emacs.d/site-lisp/eim/py.txt")
+;;
+;(require 'init-keychord)
+
+;(setq hydra-examples-verbatim t)
+;(require 'init-hydra)
+
+
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)