emacs - add eshell config , disable linum-mode hl current line

[dotfiles.git] / emacs.d / init.el

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2d0350b..dff7a8e 100644 (file)
--- 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)