 	     :pin melpa-stable)
 ;(add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
 
-;; (require 'whitespace)
-;; (setq whitespace-line-column 80)
-;; (setq whitespace-style '(face-lines-tail))
-;; (add-hook 'prog-mode-hook 'whitespace-mode)
+(require 'whitespace)
+(setq whitespace-line-column 80)
+(setq whitespace-style '(face-lines-tail))
+(add-hook 'prog-mode-hook 'whitespace-mode)
 ;;
 ;; DEPRECATED but kept for sentimental or documentation reasons
 ;;

  (split-window-horizontally)
  (split-window-horizontally)
  (balance-windows))
(global-set-key [f5] 'oth-split-and-balance)
(global-set-key [f7] 'delete-other-windows-vertically)

(global-set-key [(control x) (v) (b)] 'magit-status)
;; (global-unset-key (kbd "C-x g"))

; confirm leaving Emacs (why would you want to, right?)
(setq kill-emacs-query-functions

;                      (holiday-fixed 7 14 "National Day")
;                      (holiday-fixed 11 11 "World War One Armistice")
;                      (holiday-fixed 7 14 "Bastille Day")))

;; Put autosave files (ie #foo#) in one place, *not* scattered all over the
;; file system! (The make-autosave-file-name function is invoked to determine
