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

fix(layout): prevent magit from stealing t in bépo

Browse source 
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
This commit is contained in:
Gerry Agbobada 2021-09-15 09:49:31 +02:00 • committed by Henrik Lissner
parent 9ef5ca2922
commit a096e9493b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/input/layout/+bepo.el
View file

@ -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-staged-section-map
magit-unstaged-section-map magit-unstaged-section-map
magit-untracked-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 ;; takes precedence over the evil command to go up one line
;; :nv doesn't work on this, needs to be the bare map. ;; :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 ;; Key Bindings
;; evil-collection-magit-mode-map-backup-map <normal-state> x ;; evil-collection-magit-mode-map-backup-map <normal-state> x
;; evil-collection-magit-mode-map-backup-map <visual-state> x ;; evil-collection-magit-mode-map-backup-map <visual-state> 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 <normal-state> x ;; magit-mode-map <normal-state> x
;; magit-mode-map <visual-state> x ;; magit-mode-map <visual-state> x
;; magit-mode-map s ;; 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 ;; 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 ;; runs on `evil-collection-magit-maps', which is way to short to cover all
;; usages. The hook is run manually on other maps ;; usages. The hook is run manually on other maps