summaryrefslogtreecommitdiff
path: root/modes
diff options
context:
space:
mode:
authorJames Nguyen <james@jojojames.com>2021-01-30 00:31:50 -0800
committerJames Nguyen <james@jojojames.com>2021-01-30 00:33:41 -0800
commit2bbaa52d22f802615f8193b63ed15be8417815c1 (patch)
tree8c61a712ca2a1ecb94b78247f77dbbaf75c5a822 /modes
parentbe3e955f06517371ee348daa6f08ec8eeb973f16 (diff)
Magit: Add submodule prefix back in after forge loads (#446)
Diffstat (limited to 'modes')
-rw-r--r--modes/magit/evil-collection-magit.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/modes/magit/evil-collection-magit.el b/modes/magit/evil-collection-magit.el
index 42a2549..a912502 100644
--- a/modes/magit/evil-collection-magit.el
+++ b/modes/magit/evil-collection-magit.el
@@ -596,6 +596,12 @@ evil-collection-magit affects.")
(dolist (change evil-collection-magit-popup-changes)
(apply #'evil-collection-magit-change-popup-key change))
(with-eval-after-load 'forge
+ ;; When `forge' is loaded, it maps `forge-dispatch' to ' key which is
+ ;; set for `magit-submodule', wiping it so we add it back after `forge'
+ ;; loads.
+ (transient-append-suffix 'magit-dispatch "M"
+ '("'" "Submodule" magit-submodule))
+ ;; Clear `forge' key and re-add back in as "@".
(transient-remove-suffix 'magit-dispatch 'forge-dispatch)
(transient-append-suffix 'magit-dispatch "!"
'("@" "Forge" forge-dispatch)))