X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=dff7a8e10e6106fd6f55246452c191b00f0e2bee;hb=bad615b63502f55ac9792f6c66640d3908186169;hp=c281accaab68f7af2563ffb62be1ad9ef75eb73e;hpb=13f8919cf244d4a8f73d0bd3193f6434a0ad1a22;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index c281acc..dff7a8e 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,8 +7,6 @@
 
 (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)
@@ -23,21 +16,17 @@
 (require 'init-color-theme)
 ;(require 'init-ido)
 (require 'init-magit)
-;(require 'init-evil)
+(require 'init-evil)
 (require 'init-project)
 (require 'init-ggtags)
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
-
 
 ;;;; conflict with C-c . in org-mode, disable it temporarily
 ;;;;(require 'init-c-cpp)
 (require 'init-key-binding)
 (require 'init-winner)
 (require 'init-minibuffer)
-
+(require 'init-eshell)
 
 ;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
 ;;;(ac-linum-workaround)
@@ -119,18 +108,28 @@
 ;(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")
+;;  (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)
+
 
-  (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 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
 
 
+(require 'init-multi-term)