From 5c50b65e9508e2326af7202fcd577fda6b7d7553 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 23 Jun 2024 15:30:48 -0400 Subject: [PATCH] bump: ws-butler hlissner/ws-butler@572a10c11b6c -> lewang/ws-butler@e3a38d93e010 I switch back to upstream ws-butler to reduce maintenance burden, and because the two issues my fork resolves are now resolved upstream, in doom-modeline (see lewang/ws-butler#31). I also change ws-butler-keep-whitespace-before-point to its default for #7843. Revert: c59ae5d172c9 Ref: lewang/ws-butler#31 Close: #7843 Fix: #7516 --- lisp/doom-editor.el | 11 ++++++----- lisp/packages.el | 6 +----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el index 60f8a2bff..a6c23f051 100644 --- a/lisp/doom-editor.el +++ b/lisp/doom-editor.el @@ -730,11 +730,12 @@ on." ;; a less intrusive `delete-trailing-whitespaces' on save :hook (doom-first-buffer . ws-butler-global-mode) :config - ;; ws-butler normally preserves whitespace in the buffer (but strips it from - ;; the written file). While sometimes convenient, this behavior is not - ;; intuitive. To the average user it looks like whitespace cleanup is failing, - ;; which causes folks to redundantly install their own. - (setq ws-butler-keep-whitespace-before-point nil)) + (pushnew! ws-butler-global-exempt-modes + 'special-mode + 'comint-mode + 'term-mode + 'eshell-mode + 'diff-mode)) (provide 'doom-editor) ;;; doom-editor.el ends here diff --git a/lisp/packages.el b/lisp/packages.el index bcac1d58d..5af323dee 100644 --- a/lisp/packages.el +++ b/lisp/packages.el @@ -33,11 +33,7 @@ (package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c") (package! pcre2el :pin "380723b2701cceb75c266440fb8db918f3340d50") (package! smartparens :pin "f7cf316715e5018186c226aab8242c9e5ce131c8") -(package! ws-butler - ;; Use my fork of ws-butler, which has a few choice improvements and - ;; optimizations (the original has been abandoned). - :recipe (:host github :repo "hlissner/ws-butler") - :pin "572a10c11b6cb88293de48acbb59a059d36f9ba5") +(package! ws-butler :pin "e3a38d93e01014cd47bf5af4924459bd145fd7c4") ;; doom-projects.el (package! projectile :pin "0163b335a18af0f077a474d4dc6b36e22b5e3274")