 (blink-cursor-mode 0)
 
 ;;; Respawn the scratch buffer if it is killed (C-x k).
-;; currently borked
-(save-excursion
-  (set-buffer (get-buffer-create "*scratch*"))
-  (make-local-variable 'kill-buffer-query-functions)
-  (add-hook 'kill-buffer-query-functions 'kill-scratch-buffer))
 (defun kill-scratch-buffer ()
+  "Kill the *scratch* buffer and then respawn it."
   ;; The next line is just in case someone calls this manually
   (set-buffer (get-buffer-create "*scratch*"))
 



;;;; Eshell
(require 'eshell)
(setq eshell-directory-name (concat emacs-var-directory "eshell/"))


;;;; Source code manipulation

;;; Display and cleanup bogus whitespace.
;;; See http://www.emacswiki.org/emacs/WhiteSpace
(require 'whitespace)
(setq whitespace-style '(face tabs trailing indentation empty))
(global-whitespace-mode 1)
