From 3a9d71599d8abdbe8cb3459001e7e6b197c79e49 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 3 Mar 2019 09:34:50 -0800
Subject: Move delete-trailing-whitespace into init

It's small enough that it doesn't require its own file.
---
 emacs/.emacs.d/init.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 95a7469..274d2dc 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -43,7 +43,6 @@
 
 ;;;; Dependencies
 
-(require 'destroy-trailing-whitespace)
 (require 'diminish)
 
 ;;;; Settings
@@ -84,8 +83,6 @@
 (global-set-key (kbd "C-x f") 'ffap)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 
-(global-destroy-trailing-whitespace-mode)
-
 (setq require-final-newline t)
 
 (setq-default indent-tabs-mode nil)
@@ -112,6 +109,12 @@
 (with-eval-after-load 'browse-url
   (setq browse-url-browser-function 'browse-url-firefox))
 
+(defun init--destroy-trailing-whitespace ()
+  "Delete trailing whitespace everywhere, except in Markdown buffers."
+  (if (not (eq major-mode 'markdown-mode))
+      (delete-trailing-whitespace)))
+
+(add-hook 'before-save-hook #'init--destroy-trailing-whitespace)
 (add-hook 'minibuffer-setup-hook 'electric-pair-local-mode)
 
 (with-eval-after-load 'paredit
-- 
cgit v1.2.3-54-g00ecf