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 c0e1fec..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)
@@ -113,7 +109,7 @@
 
 
 ;(require 'init-org)
-;(setq help-window-select t)
+(setq help-window-select t)
 
 
 ;;  (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
@@ -134,3 +130,6 @@
 
 ;(require 'ace-window)
 ;(global-set-key (kbd "M-p") 'ace-window)
+
+
+(require 'init-multi-term)