From 0118b4f852d46086bd4c001425538dbb0644a106 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Tue, 22 Sep 2015 23:16:54 +0800 Subject: [PATCH] emacs - remove custom setting from init.el 2. add diredp plugin --- emacs.d/config/init-base.el | 2 +- emacs.d/init.el | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el index 2c26322..9fb6d2b 100644 --- a/emacs.d/config/init-base.el +++ b/emacs.d/config/init-base.el @@ -44,7 +44,7 @@ ;; create new file key map (define-key dired-mode-map "c" 'find-file) ;; ^ goto-up directory -;(define-key dired-mode-map "\C-c \C-u" ') +(define-key dired-mode-map (kbd "C-c C-u") 'dired-up-directory) (setq diredp-hide-details-initially-flag t) (setq diredp-hide-details-propagate-flag t) diff --git a/emacs.d/init.el b/emacs.d/init.el index 0e486ec..2afcaca 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -7,6 +7,10 @@ (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) @@ -144,3 +148,43 @@ ;; 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) + + + +(require 'dired+) -- 2.11.0