From a096e9493b4e24090cf63c2834cd54fec47b6e2b Mon Sep 17 00:00:00 2001 From: Gerry Agbobada Date: Wed, 15 Sep 2021 09:49:31 +0200 Subject: [PATCH] =?UTF-8?q?fix(layout):=20prevent=20magit=20from=20stealin?= =?UTF-8?q?g=20t=20in=20b=C3=A9po?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just as magit took control of 's' after "key rotation", magit (at least when unpinned) takes control of 't' and we need to manually unmap the key so that 't' goes down one line when the cursor is on a magit section header --- modules/input/layout/+bepo.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el index 8fa1edcc8..f24da8a0b 100644 --- a/modules/input/layout/+bepo.el +++ b/modules/input/layout/+bepo.el @@ -217,10 +217,10 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k magit-staged-section-map magit-unstaged-section-map magit-untracked-section-map)) - ;; Without this, "s" is mapped to 'magit-delete-thing (the old "k" for "kill") and + ;; Without this, "s" is mapped to `magit-delete-thing' (the old "k" for "kill") and ;; takes precedence over the evil command to go up one line ;; :nv doesn't work on this, needs to be the bare map. - ;; This is the output of `describe-function 'magit-delete-thing` when we add :nv or :nvm + ;; This is the output of `describe-function `magit-delete-thing' when we add :nv or :nvm ;; Key Bindings ;; evil-collection-magit-mode-map-backup-map x ;; evil-collection-magit-mode-map-backup-map x @@ -230,7 +230,10 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k ;; magit-mode-map x ;; magit-mode-map x ;; magit-mode-map s - (map! :map magit-mode-map "s" nil) + ;; Same thing for t, which gets mapped to `magit-quick-status' + (map! :map magit-mode-map + "s" nil + "t" nil) ;; Even though magit bindings are part of evil-collection now, the hook only ;; runs on `evil-collection-magit-maps', which is way to short to cover all ;; usages. The hook is run manually on other maps