From 7d48151628e5043579342af118566a2434a15b6e Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@originate.com>
Date: Wed, 6 Jun 2018 10:54:17 -0700
Subject: [PATCH] Make whitespace trimming work right with ws-butler

---
 dotfiles/emacs.d/init.el    | 28 ++++++----------------------
 dotfiles/emacs.d/package.el |  4 ++++
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 8205ef8..92ef4af 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -70,8 +70,7 @@
 ;; Stuff all of the org files you want under ~/org and they will be loaded automatically
 ;; and have their TODO items accessible by typing C-c a t
 (setq org-agenda-files '("~/org"))
-(
-setq org-log-done t)
+(setq org-log-done t)
 
 ;;--------------------------------------------------------------------------------------
 ;; Prefer unix style line endings
@@ -117,8 +116,9 @@ setq org-log-done t)
          ("Text" (or (filename . ".csv")
                      (filename . ".tsv")
                      (filename . ".txt")
-                     (filename . ".log")))
-         
+                     (filename . ".log")
+                     (filename . ".json")))
+
          ("Emacs" (or (name . "^\\*scratch\\*$")
                       (name . "^\\*Messages\\*$")))
          ("Gnus" (or (mode . message-mode)
@@ -148,28 +148,12 @@ setq org-log-done t)
 ;; handy editor stuff
 ;;--------------------------------------------------------------------------------------
 
-(defun delete-trailing-blank-lines ()
-  "Deletes all blank lines at the end of the file, even the last one"
-  (interactive)
-  (save-excursion
-    (save-restriction
-      (widen)
-      (goto-char (point-max))
-      (delete-blank-lines)
-      (let ((trailnewlines (abs (skip-chars-backward "\n\t"))))
-        (if (> trailnewlines 0)
-            (progn
-              (delete-char trailnewlines)))))))
-
-(add-hook 'before-save-hook 'delete-trailing-whitespace)
-(add-hook 'before-save-hook 'delete-trailing-blank-lines)
+(require 'ws-butler)
+(ws-butler-global-mode)
 
 ;; Comment this if you dont mind git diffs complaining about missing ending newlines.
 (setq require-final-newline t)
 
-;; Uncomment this if you dont mind git diffs complaining about missing ending newlines.
-; (add-hook 'before-save-hook 'delete-trailing-blank-lines)
-
 ;; Add new line if using C-n navigates to the end of the buffer
 (setq next-line-add-newlines t)
 
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 648b249..c009a65 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -25,6 +25,10 @@
                       neotree
                       ;;;;;;;;;;;;;
 
+                      ;; Cleanup
+                      ws-butler
+                      ;;;;;;;;;;
+                      
                       ;; UI
                       fill-column-indicator
                       golden-ratio