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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index dff7a8e..a4f9ddc 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,29 +1,44 @@
 
+
+;; 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)
 
 
 (add-to-list 'load-path "~/.emacs.d/config")
 
+;; remove custom setting out of init.el
+;; http://emacsblog.org/2008/12/06/quick-tip-detaching-the-custom-file/
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file 'noerror)
 
-(require 'init-base)
-(require 'init-font)
 
 (require 'my-packages)
+(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)
@@ -32,21 +47,21 @@
 ;;;(ac-linum-workaround)
 
 
-(require 'init-mode-line)
-(require 'init-workgroup2)
+;(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)
@@ -112,20 +127,11 @@
 (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)
-;(require 'init-hydra)
+(require 'init-hydra)
 
 
 ;(require 'ace-window)
@@ -133,3 +139,54 @@
 
 
 (require 'init-multi-term)
+;(require 'init-projectile)
+
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)
+
+;(setq projectile-completion-system 'helm)
+;(helm-projectile-on)
+
+
+;; show projectile name in mode-line
+
+
+(if (locate-library "ediff")
+    (progn
+      (autoload 'ediff-files "ediff")
+      (autoload 'ediff-buffers "ediff")
+
+       (eval-after-load "ediff" '(progn
+  			  (message "doing ediff customisation")
+			  (setq diff-switches               "-u"
+				ediff-custom-diff-options   "-U3"
+				ediff-split-window-function 'split-window-horizontally
+				ediff-window-setup-function 'ediff-setup-windows-plain)
+
+			  (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display)
+			  (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display)
+			  (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)))))
+
+
+
+(defun update-diff-colors ()
+  "update the colors for diff faces"
+  (set-face-attribute 'diff-added nil
+                      :foreground "white" :background "blue")
+  (set-face-attribute 'diff-removed nil
+                      :foreground "white" :background "red3")
+  (set-face-attribute 'diff-changed nil
+                      :foreground "white" :background "purple"))
+(eval-after-load "diff-mode"
+  '(update-diff-colors))
+
+
+
+;(require 'helm-ag)
+;(require 'flx)
+;(flx-ido-mode t)
+
+
+
+(fringe-mode (quote (0 . 0)))