X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=2a75e7d3c4be977c27a627589aa6141769eb46f5;hb=cbe33da863e0f9a39b1c78bd95f37360bb5a1b53;hp=2d0350bdb8604bf0106de843654bf79a89722f4f;hpb=fe8c2a872ee7ab2ea79d9be33798639a36c805f8;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2d0350b..2a75e7d 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -20,17 +20,13 @@
 (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)
@@ -129,7 +125,7 @@
 ;(require 'init-keychord)
 
 ;(setq hydra-examples-verbatim t)
-;(require 'init-hydra)
+(require 'init-hydra)
 
 
 ;(require 'ace-window)