emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Magit: Keep bindings consistent with prefix key in magit-revert 

"O" is used to launch `magit-reset`, not `magit-revert`. "_" and "-"
should be used for the suffix commands to be consistent with the
prefix key "_".
This commit is contained in:
Kira Bruneau 2021-04-13 20:53:05 -04:00 committed by James N
parent f2be912970
commit 65766ad8c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modes/magit/evil-collection-magit.el
View File

@ -573,7 +573,7 @@ evil-collection-magit affects.")
(magit-dispatch "v" "-" magit-reverse)
(magit-dispatch "k" "x" magit-discard)
(magit-remote "k" "x" magit-remote-remove)
(magit-revert "v" "o" magit-revert-no-commit)
(magit-revert "v" "-" magit-revert-no-commit)
;; FIXME: how to properly handle a popup with a key that appears twice (in
;; `define-transient-command' definition)? Currently we rely on:
;; 1. first call to `evil-collection-magit-change-popup-key' changes the first "V"
@ -581,8 +581,8 @@ evil-collection-magit affects.")
;; definition of `magit-revert'), second call changes the second "V".
;; 2. the remapping here are in the same order as in `magit-revert'
;; definition
(magit-revert "V" "O" magit-revert-and-commit)
(magit-revert "V" "O" magit-sequencer-continue)
(magit-revert "V" "_" magit-revert-and-commit)
(magit-revert "V" "_" magit-sequencer-continue)
(magit-tag "k" "x" magit-tag-delete)))
"Changes to popup keys")