diff options
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -6,8 +6,6 @@ (setq-default gc-cons-threshold 20000000 ; gc every 20 MB allocated (form flx-ido docs) - ediff-split-window-function - 'split-window-horizontally ; diff horizontally inhibit-splash-screen t ; disable splash screen truncate-lines t ; truncate, not wrap, lines indent-tabs-mode nil ; only uses spaces for indentation @@ -37,6 +35,12 @@ (global-set-key (kbd "C-c g") 'rgrep) ; grep +;;; ediff +(setq-default + ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain) + + ;;; Darwin (setq is-mac (equal system-type 'darwin)) (when is-mac @@ -217,6 +221,7 @@ js2-mode-hook html-mode-hook css-mode-hook + sass-mode-hook clojure-mode-hook emacs-lisp-mode-hook conf-mode-hook |