equal
deleted
inserted
replaced
4 ;;;; General ;;;; |
4 ;;;; General ;;;; |
5 (add-to-list 'load-path "~/.emacs.d/elisp") ; set default emacs load path |
5 (add-to-list 'load-path "~/.emacs.d/elisp") ; set default emacs load path |
6 |
6 |
7 (setq-default |
7 (setq-default |
8 gc-cons-threshold 20000000 ; gc every 20 MB allocated (form flx-ido docs) |
8 gc-cons-threshold 20000000 ; gc every 20 MB allocated (form flx-ido docs) |
9 ediff-split-window-function |
|
10 'split-window-horizontally ; diff horizontally |
|
11 inhibit-splash-screen t ; disable splash screen |
9 inhibit-splash-screen t ; disable splash screen |
12 truncate-lines t ; truncate, not wrap, lines |
10 truncate-lines t ; truncate, not wrap, lines |
13 indent-tabs-mode nil ; only uses spaces for indentation |
11 indent-tabs-mode nil ; only uses spaces for indentation |
14 split-width-threshold 181 ; min width to split window horizontially |
12 split-width-threshold 181 ; min width to split window horizontially |
15 split-height-threshold 120 ; min width to split window vertically |
13 split-height-threshold 120 ; min width to split window vertically |
33 (global-hl-line-mode t) ; highlight current line |
31 (global-hl-line-mode t) ; highlight current line |
34 (global-set-key (kbd "C-c c") 'compile) ; compile |
32 (global-set-key (kbd "C-c c") 'compile) ; compile |
35 (global-set-key (kbd "C-c r") 'recompile) ; recompile |
33 (global-set-key (kbd "C-c r") 'recompile) ; recompile |
36 (global-set-key (kbd "C-c a") 'align-regexp) ; align |
34 (global-set-key (kbd "C-c a") 'align-regexp) ; align |
37 (global-set-key (kbd "C-c g") 'rgrep) ; grep |
35 (global-set-key (kbd "C-c g") 'rgrep) ; grep |
|
36 |
|
37 |
|
38 ;;; ediff |
|
39 (setq-default |
|
40 ediff-split-window-function 'split-window-horizontally |
|
41 ediff-window-setup-function 'ediff-setup-windows-plain) |
38 |
42 |
39 |
43 |
40 ;;; Darwin |
44 ;;; Darwin |
41 (setq is-mac (equal system-type 'darwin)) |
45 (setq is-mac (equal system-type 'darwin)) |
42 (when is-mac |
46 (when is-mac |
215 python-mode-hook |
219 python-mode-hook |
216 haskell-mode-hook |
220 haskell-mode-hook |
217 js2-mode-hook |
221 js2-mode-hook |
218 html-mode-hook |
222 html-mode-hook |
219 css-mode-hook |
223 css-mode-hook |
|
224 sass-mode-hook |
220 clojure-mode-hook |
225 clojure-mode-hook |
221 emacs-lisp-mode-hook |
226 emacs-lisp-mode-hook |
222 conf-mode-hook |
227 conf-mode-hook |
223 yaml-mode-hook)) |
228 yaml-mode-hook)) |
224 |
229 |