From 9d7885abbfea0022d12e435e060cbfd7012ae2f0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 10 Jul 2024 01:16:29 -0400 Subject: [PATCH] fix(evil): q/Q keybinds in view-mode Caused by evil-collection-view binding q to quit-window, which breaks view-exit-action. This should be reported upstream. --- modules/editor/evil/init.el | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el index f9b1f2924..0c0a89b76 100644 --- a/modules/editor/evil/init.el +++ b/modules/editor/evil/init.el @@ -359,4 +359,13 @@ and complains if a module is loaded too early (during startup)." (dolist (mode evil-collection-mode-list) (dolist (req (or (cdr-safe mode) (list mode))) (with-eval-after-load req - (+evil-collection-init mode +evil-collection-disabled-list)))))) + (+evil-collection-init mode +evil-collection-disabled-list))))) + + ;; HACK: The Diff options in `save-some-buffers's prompt should persist after + ;; you quit view-mode, but evil-collection-view's bindings on q/Q break + ;; this, so these are here to restore them. + ;; REVIEW: PR this upstream! + (map! :after (view evil-collection-view) + :map view-mode-map + :n "q" #'View-quit + :n "Q" #'View-quit-all))