[nongnu] elpa/ws-butler 2acf9ac04b 09/14: Merge pull request #53 from Apteryks/merge-hlissner-fork-improvements

[ELPA Syncer]

branch: elpa/ws-butler
commit 2acf9ac04b2470eb2289f1c64c47baeaabd02809
Merge: e3a38d93e0 a8612c15f6
Author: Le Wang <lewang@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #53 from Apteryks/merge-hlissner-fork-improvements
    
    Merge hlissner fork improvements
---
 ws-butler.el | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/ws-butler.el b/ws-butler.el
index 4eb2261996..cac4b30761 100644
--- a/ws-butler.el
+++ b/ws-butler.el
@@ -92,7 +92,12 @@ changed in this specific way."
   :group 'ws-butler)
 
 (defcustom ws-butler-global-exempt-modes
-  '(markdown-mode)
+  '(special-mode
+    comint-mode
+    term-mode
+    eshell-mode
+    diff-mode
+    markdown-mode)
   "Don't enable ws-butler in modes that inherit from these.
 
 This should be a list of trailing whitespace significant major-modes."
@@ -140,7 +145,7 @@ Also see `require-final-newline'."
      ;;
      ;; We refuse to remove final-newline regardless of the value of
      ;; `require-final-newline'
-     (when (looking-at "\n\\(\n\\|\\'\\)")
+     (when (looking-at-p "\n\\(?:\n\\|\\'\\)")
        (forward-char 1)))
    (when require-final-newline
      (unless (bolp)
@@ -303,18 +308,18 @@ for lines modified by you."
   :group 'ws-butler
   (if ws-butler-mode
       (progn
-        (add-hook 'after-change-functions 'ws-butler-after-change t t)
-        (add-hook 'before-save-hook 'ws-butler-before-save t t)
-        (add-hook 'after-save-hook 'ws-butler-after-save t t)
-        (add-hook 'before-revert-hook 'ws-butler-before-revert t t)
-        (add-hook 'after-revert-hook 'ws-butler-after-save t t)
-        (add-hook 'edit-server-done-hook 'ws-butler-before-save t t))
-    (remove-hook 'after-change-functions 'ws-butler-after-change t)
-    (remove-hook 'before-save-hook 'ws-butler-before-save t)
-    (remove-hook 'after-save-hook 'ws-butler-after-save t)
-    (remove-hook 'before-revert-hook 'ws-butler-before-revert t)
-    (remove-hook 'after-revert-hook 'ws-butler-after-save t)
-    (remove-hook 'edit-server-done-hook 'ws-butler-before-save t)))
+        (add-hook 'after-change-functions #'ws-butler-after-change t t)
+        (add-hook 'before-save-hook #'ws-butler-before-save t t)
+        (add-hook 'after-save-hook #'ws-butler-after-save t t)
+        (add-hook 'before-revert-hook #'ws-butler-before-revert t t)
+        (add-hook 'after-revert-hook #'ws-butler-after-save t t)
+        (add-hook 'edit-server-done-hook #'ws-butler-before-save t t))
+    (remove-hook 'after-change-functions #'ws-butler-after-change t)
+    (remove-hook 'before-save-hook #'ws-butler-before-save t)
+    (remove-hook 'after-save-hook #'ws-butler-after-save t)
+    (remove-hook 'before-revert-hook #'ws-butler-before-revert t)
+    (remove-hook 'after-revert-hook #'ws-butler-after-save t)
+    (remove-hook 'edit-server-done-hook #'ws-butler-before-save t)))
 
 ;;;###autoload
 (define-globalized-minor-mode ws-butler-global-mode ws-butler-mode