# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1270584830 18000
# Node ID ccab2fe3a256563d3915d0895809c72a82922754
# Parent  88ba320ffe7d660ec23b6d4e665035d3d54ddef6# Parent  5dbff8b65be763456c2164ba09217dab52d0eade
Merge

diff --git a/.elisp/settings/40.modes.el b/.elisp/settings/40.modes.el
--- a/.elisp/settings/40.modes.el
+++ b/.elisp/settings/40.modes.el
@@ -17,9 +17,13 @@ point."
 (add-hook 'c-mode-hook          'af-tab-fix)
 (add-hook 'sh-mode-hook         'af-tab-fix)
 (add-hook 'emacs-lisp-mode-hook 'af-tab-fix)
-(add-hook 'rst-mode-hook '(lambda ()
-                            (make-variable-buffer-local 'af-cleanup-whitespace)
-                            (set-variable 'af-cleanup-whitespace nil)))
+(defun af-no-clean-whitespace ()
+  (make-variable-buffer-local 'af-cleanup-whitespace)
+  (set-variable 'af-cleanup-whitespace nil))
+(add-hook 'rst-mode-hook 'af-no-clean-whitespace)
+(add-hook 'makefile-mode-hook '(lambda ()
+                                 (af-no-clean-whitespace)
+                                 (add-hook 'font-lock-mode-hook 'show-ws-highlight-tabs)))
 
 (autoload 'js2-mode "js2" nil t)
 (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
diff --git a/.elisp/settings/90.keybindings.el b/.elisp/settings/90.keybindings.el
--- a/.elisp/settings/90.keybindings.el
+++ b/.elisp/settings/90.keybindings.el
@@ -1,6 +1,7 @@
 ;; Key Bindings
 ; M-backspace kills the current buffer
 (global-set-key [(meta backspace)] 'kill-this-buffer)
+(global-set-key "\M-\d" 'kill-this-buffer)
 ; Save early and often, with only one keystroke
 (global-set-key [(meta s)] 'save-buffer)
 ; Typing tab is for lesser editors, make hitting return do that