+
+;; 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")))
(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)
;;;(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)
(require 'init-multi-term)
-(require 'init-projectile)
+;(require 'init-projectile)
(require 'page-break-lines)
;(turn-on-page-break-lines-mode)
;; 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)))