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

fix(magit): evil keybinds for magit-worktree

Browse source 
For some reason, the transient-append-suffix adding magit-worktree back
to magit-dispatch — after its potential replacement by
magit-gitflow-popup — was having no effect. (It does when moved into
(after! magit-gitflow), so the issue must have something to do with when
transient-append-suffix is called.) magit-worktree wasn't appearing in
the magit-dispatch popup when magit-gitflow was enabled, nor was the '*'
keybind for magit-worktree in effect outside (or inside) the popup,
unlike '%' for magit-gitflow-popup.

Replace the ineffectual transient-append-suffix with a normal and visual
mode keybind for magit-worktree in magit-mode-map (and move the
unconditionally defined keybind for magit-gitflow-popup into (after!
magit-gitflow)). Also, append the magit-gitflow-popup transient suffix
to magit-worktree instead of replacing it, so that the latter still
appears in magit-dispatch (though under the original keybind 'Z' — which
isn't really an issue, since evil-collection-magit doesn't seem to
update the keybinds of any of the other commands accessible from
magit-dispatch — but also callable with '*').
This commit is contained in:
Paul A. Patience 2022-10-05 09:16:54 -04:00 • committed by GitHub
parent 191745424b
commit 398ee2cd94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/tools/magit/config.el
View file

@ -242,7 +242,7 @@ ensure it is built when we actually use Forge."
;; Some extra vim-isms I thought were missing from upstream ;; Some extra vim-isms I thought were missing from upstream
(evil-define-key* '(normal visual) magit-mode-map (evil-define-key* '(normal visual) magit-mode-map
"%" #'magit-gitflow-popup "*" #'magit-worktree
"zt" #'evil-scroll-line-to-top "zt" #'evil-scroll-line-to-top
"zz" #'evil-scroll-line-to-center "zz" #'evil-scroll-line-to-center
"zb" #'evil-scroll-line-to-bottom "zb" #'evil-scroll-line-to-bottom
@ -283,11 +283,10 @@ ensure it is built when we actually use Forge."
"gk" #'git-rebase-move-line-up)) "gk" #'git-rebase-move-line-up))
(after! magit-gitflow (after! magit-gitflow
(transient-replace-suffix 'magit-dispatch 'magit-worktree (evil-define-key* '(normal visual) magit-mode-map
'("%" "Gitflow" magit-gitflow-popup))) "%" #'magit-gitflow-popup)
(transient-append-suffix 'magit-dispatch 'magit-worktree
(transient-append-suffix 'magit-dispatch '(0 -1 -1) '("%" "Gitflow" magit-gitflow-popup))))
'("*" "Worktree" magit-worktree)))
(use-package! evil-collection-magit-section (use-package! evil-collection-magit-section