about summary refs log tree commit diff
path: root/emacs.d/init-modes.el
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2013-07-28T22·53+0200
committerVincent Ambo <vincent@spotify.com>2013-07-28T22·53+0200
commitcdffc846bbc81a8bbf976a46321898fdd7073c17 (patch)
tree64eda420b3528da1f605bfb241be968c423960d6 /emacs.d/init-modes.el
parent488a5c4956ea5789528b48d5a8dd97c9c8f3e701 (diff)
Emacs: Various changes:
- Moved Haskell-mode configuration to customize
- Disabled Paredit in non-lisp buffers (or more explicitly: Enabled it
  in Elisp and Clojure buffers)
- Removed some custom items that I don't use anymore (e.g. Jabber-mode
  because I switched to bitlbee with rcirc)
- New packages: hi2 (Haskell indent mode revamped), browse-kill-ring
- Always enable undo-tree-mode and recentf-mode
- Keep all auto-save files in /tmp
Diffstat (limited to 'emacs.d/init-modes.el')
-rw-r--r--emacs.d/init-modes.el15
1 files changed, 11 insertions, 4 deletions
diff --git a/emacs.d/init-modes.el b/emacs.d/init-modes.el
index 74178b1e8463..39dcfd74bc38 100644
--- a/emacs.d/init-modes.el
+++ b/emacs.d/init-modes.el
@@ -14,8 +14,9 @@
 
 ;; Configure haskell-mode
 ;; Enable semi-automatic indentation and font-locking
-(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-(add-hook 'haskell-mode-hook 'font-lock-mode)
+(require 'hi2)
+;;(add-hook 'haskell-mode-hook 'turn-on-hi2)
+;;(add-hook 'haskell-mode-hook 'font-lock-mode)
 
 ;; Add keybindings to move nested blocks with C-, rsp. C-.
 (define-key haskell-mode-map (kbd "C-,") 'haskell-move-nested-left)
@@ -40,11 +41,17 @@
 ;; Enable rainbow-delimiters for all things programming
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
 
-;; Enable paredit in all programming buffers
-(add-hook 'prog-mode-hook 'paredit-mode)
+;; Enable Paredit in Emacs Lisp mode
+(add-hook 'emacs-lisp-mode-hook 'paredit-mode)
 
 ;; Always highlight matching brackets
 (show-paren-mode 1)
 
+;; Undo-Tree at all times!
+(undo-tree-mode)
+
+;; Keep track of recent files
+(recentf-mode)
+
 ;; Enable Nyan mode
 (nyan-mode 1)