From fffefc311816aacec3961d19e4755ff21d19af5c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 20 Sep 2025 14:22:15 -0400 Subject: [PATCH] fix(format): consolidate save-without-formatting keybind It's too much hassle to claim either 'SPC b s' or 'SPC f s' for the saving-without-formatting command (and to justify why one over the other), so porque no los dos? Plus, I now leave 'C-x C-s' (save-buffer) alone; principle of least surprise and what not. Fix: #8460 Ref: https://xkcd.com/1172 --- modules/config/default/+evil-bindings.el | 2 +- modules/editor/format/config.el | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 1e505994c..9acd4432b 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -417,7 +417,7 @@ :desc "Previous buffer" "p" #'previous-buffer :desc "Revert buffer" "r" #'revert-buffer :desc "Rename buffer" "R" #'rename-buffer - :desc "Save buffer" "s" #'save-buffer + :desc "Save buffer" "s" #'basic-save-buffer :desc "Save all buffers" "S" #'evil-write-all :desc "Save buffer as root" "u" #'doom/sudo-save-buffer :desc "Pop up scratch buffer" "x" #'doom/open-scratch-buffer diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el index 79ba4d55b..13d6824dd 100644 --- a/modules/editor/format/config.el +++ b/modules/editor/format/config.el @@ -47,8 +47,7 @@ This is controlled by `+format-on-save-disabled-modes'." ;; UX: Use prefix-arg on `save-buffer' or `basic-save-buffer' to inhibit ;; format-on-save behavior. - (define-key apheleia-mode-map [remap basic-save-buffer] #'+format/save-buffer-no-reformat) - (define-key apheleia-mode-map [remap save-buffer] #'+format/save-buffer) + (define-key apheleia-mode-map [remap basic-save-buffer] #'+format/save-buffer) ;; HACK: Apheleia suppresses notifications that the current buffer has ;; changed, so plugins that listen for them need to be manually informed: