diff options
| author |  Tom Willemsen | 2012-11-14 20:12:55 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-11-14 20:12:55 +0100 |
| commit | 9c12ab571850a3b62791a51dd5d8fb49cfc91f92 (patch) | |
| tree | cc9f45bdcb2ba31786a31037d1c42bddf17db514 /.emacs.d/init.el | |
| parent | 57e1063403ffd9519001e39ac92df9abeb42d879 (diff) | |
| parent | 5abfdc6b5cc8360ca5a1880e6bc65670add10a78 (diff) | |
| download | dotfiles-9c12ab571850a3b62791a51dd5d8fb49cfc91f92.tar.gz dotfiles-9c12ab571850a3b62791a51dd5d8fb49cfc91f92.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index cfe1e92..6af7c3e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -21,7 +21,6 @@ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))) (require 'ext) -(require 'mode-icons) (require 'oni) (defalias 'dabbrev-expand 'hippie-expand) @@ -265,7 +264,6 @@ (setq php-function-call-face 'font-lock-function-name-face) (setq php-mode-force-pear t) (setq pony-tpl-indent-moves t) -(setq pretty-symbol-categories '(lambda relational logical)) (setq rainbow-delimiters-max-face-count 12) (setq redisplay-dont-pause t) (setq scroll-conservatively 101) @@ -279,7 +277,6 @@ (setq uniquify-buffer-name-style 'post-forward) (setq use-dialog-box nil) (setq user-full-name "Tom Willemsen") -(setq whitespace-style '(face trailing)) (setq window-combination-resize t) (add-hook 'after-save-hook 'oni:after-save-func t) |