emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump: ws-butler

Browse source 
hlissner/ws-butler@572a10c11b -> lewang/ws-butler@e3a38d93e0

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: c59ae5d172
Ref: lewang/ws-butler#31
Close: #7843
Fix: #7516
This commit is contained in:
Henrik Lissner 2024-06-23 15:30:48 -04:00
parent c48a5e5f9c
commit 5c50b65e95
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/doom-editor.el
View file

@ -730,11 +730,12 @@ on."
;; a less intrusive `delete-trailing-whitespaces' on save ;; a less intrusive `delete-trailing-whitespaces' on save
:hook (doom-first-buffer . ws-butler-global-mode) :hook (doom-first-buffer . ws-butler-global-mode)
:config :config
;; ws-butler normally preserves whitespace in the buffer (but strips it from (pushnew! ws-butler-global-exempt-modes
;; the written file). While sometimes convenient, this behavior is not 'special-mode
;; intuitive. To the average user it looks like whitespace cleanup is failing, 'comint-mode
;; which causes folks to redundantly install their own. 'term-mode
(setq ws-butler-keep-whitespace-before-point nil)) 'eshell-mode
'diff-mode))
(provide 'doom-editor) (provide 'doom-editor)
;;; doom-editor.el ends here ;;; doom-editor.el ends here

6
lisp/packages.el
View file

@ -33,11 +33,7 @@
(package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c") (package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c")
(package! pcre2el :pin "380723b2701cceb75c266440fb8db918f3340d50") (package! pcre2el :pin "380723b2701cceb75c266440fb8db918f3340d50")
(package! smartparens :pin "f7cf316715e5018186c226aab8242c9e5ce131c8") (package! smartparens :pin "f7cf316715e5018186c226aab8242c9e5ce131c8")
(package! ws-butler (package! ws-butler :pin "e3a38d93e01014cd47bf5af4924459bd145fd7c4")
;; 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")
;; doom-projects.el ;; doom-projects.el
(package! projectile :pin "0163b335a18af0f077a474d4dc6b36e22b5e3274") (package! projectile :pin "0163b335a18af0f077a474d4dc6b36e22b5e3274")