X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=a4f9ddc39e63bbbf4eb9e08a4f327611c5477a4b;hb=c40fd1e6681869e706d45a82afb86bc22539969b;hp=05ed8040285b23855a3fb5cf15341bf29bd43583;hpb=81001e7e9c7af808ad6a54aebf947d4026c68055;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 05ed804..a4f9ddc 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,7 +1,17 @@
 
+
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
 (setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
 (setq exec-path (append exec-path '("/usr/local/bin")))
 
+
+
+
 (setq debug-on-error t)
 
 
@@ -17,17 +27,18 @@
 (require 'init-base)
 (require 'init-font)
 
-(require 'init-color-theme)
+;(require 'init-color-theme)
+(require 'init-color-theme-2)
 ;(require 'init-ido)
 (require 'init-magit)
-(require 'init-evil)
+;(require 'init-evil)
 (require 'init-project)
 (require 'init-ggtags)
 
 
 ;;;; conflict with C-c . in org-mode, disable it temporarily
 ;;;;(require 'init-c-cpp)
-(require 'init-key-binding)
+;(require 'init-key-binding)
 (require 'init-winner)
 (require 'init-minibuffer)
 (require 'init-eshell)
@@ -36,21 +47,21 @@
 ;;;(ac-linum-workaround)
 
 
-(require 'init-mode-line)
+;(require 'init-mode-line)
 ;(require 'init-workgroup2)
 (require 'init-perl)
 
 ;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
 ;(load "pde-load")                       ;
 
-(require 'init-linum)
+;(require 'init-linum)
 
 (require 'auto-complete)
 (require 'auto-complete-config)
 (ac-config-default)
 
 
-(require 'init-helm)
+;(require 'init-helm)
 
 ;; page break configuration
 ;(require 'pp-c-l)
@@ -116,16 +127,7 @@
 (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)
@@ -137,7 +139,7 @@
 
 
 (require 'init-multi-term)
-(require 'init-projectile)
+;(require 'init-projectile)
 
 (require 'page-break-lines)
 ;(turn-on-page-break-lines-mode)
@@ -181,9 +183,10 @@
 
 
 
-(require 'helm-ag)
-(require 'flx)
-(flx-ido-mode t)
+;(require 'helm-ag)
+;(require 'flx)
+;(flx-ido-mode t)
 
 
 
+(fringe-mode (quote (0 . 0)))