ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move delete-trailing-whitespace into init

Browse source 
It's small enough that it doesn't require its own file.
This commit is contained in:
Tom Willemse 2019-03-03 09:34:50 -08:00
parent 7c88bfb998
commit 3a9d71599d
2 changed files with 6 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
emacs/.emacs.d/init.el
View file

@ -43,7 +43,6 @@
;;;; Dependencies ;;;; Dependencies
(require 'destroy-trailing-whitespace)
(require 'diminish) (require 'diminish)
;;;; Settings ;;;; Settings
@ -84,8 +83,6 @@
(global-set-key (kbd "C-x f") 'ffap) (global-set-key (kbd "C-x f") 'ffap)
(global-set-key (kbd "C-x C-b") 'ibuffer) (global-set-key (kbd "C-x C-b") 'ibuffer)
(global-destroy-trailing-whitespace-mode)
(setq require-final-newline t) (setq require-final-newline t)
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
@ -112,6 +109,12 @@
(with-eval-after-load 'browse-url (with-eval-after-load 'browse-url
(setq browse-url-browser-function 'browse-url-firefox)) (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) (add-hook 'minibuffer-setup-hook 'electric-pair-local-mode)
(with-eval-after-load 'paredit (with-eval-after-load 'paredit

66
emacs/.emacs.d/vendor-lisp/destroy-trailing-whitespace/destroy-trailing-whitespace.el
View file

@ -1,66 +0,0 @@
;;; destroy-trailing-whitespace.el --- Destroy all trailing whitespace -*- lexical-binding: t; -*-
;; Copyright (C) 2016 Tom Willemse
;; Author: Tom Willemse <chelys@drd>
;; Keywords: convenience
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This library offers a single mode that will delete all trailing
;; whitespace before saving any file. It tries to be intelligent
;; enough to only do this for modes where trailing whitespace is not
;; meaningful. Currently it only keeps whitespace around in
;; `markdown-mode' since it uses two spaces at the end of a line to
;; signify a line break.
;;
;; To use this mode in all buffers, add the following to your init
;; file:
;;
;; (require 'destroy-trailing-whitespace)
;; (global-destroy-trailing-whitespace-mode)
;;
;; To use this mode in just some buffers add it to your preferred
;; hook. For example, to use it only in `prog-mode' buffers:
;;
;; (require 'destroy-trailing-whitespace)
;; (add-hook 'prog-mode-hook 'destroy-trailing-whitespace-mode)
;;; Code:
(defun destroy-trailing-whitespace ()
"Delete trailing whitespace everywhere, except in Markdown buffers."
(if (not (eq major-mode 'markdown-mode))
(delete-trailing-whitespace)))
;;;###autoload
(define-minor-mode destroy-trailing-whitespace-mode
"Destroy all trailing whitespace before saving the buffer."
:lighter ""
(if destroy-trailing-whitespace-mode
(add-hook 'before-save-hook 'delete-trailing-whitespace nil :local)
(remove-hook 'before-save-hook 'delete-trailing-whitespace :local)))
;;;###autoload
(define-minor-mode global-destroy-trailing-whitespace-mode
"Destroy all trailing whitespace before saving any open buffer."
:lighter "" :global t
(if global-destroy-trailing-whitespace-mode
(add-hook 'before-save-hook 'destroy-trailing-whitespace)
(remove-hook 'before-save-hook 'destroy-trailing-whitespace)))
(provide 'destroy-trailing-whitespace)
;;; destroy-trailing-whitespace.el ends here