diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2021-04-13 20:53:05 -0400 |
|---|---|---|
| committer | James N <james@jojojames.com> | 2021-04-13 23:35:26 -0700 |
| commit | 65766ad8c0690278f1ce97fa68055e0d4d1531f4 (patch) | |
| tree | 9a1f7ee7d3ada1aedb0a285091ec2496fd4ff248 | |
| parent | f2be91297029ae002d15e23510f9f686d848d7a8 (diff) | |
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 "_".
| -rw-r--r-- | modes/magit/evil-collection-magit.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modes/magit/evil-collection-magit.el b/modes/magit/evil-collection-magit.el index 1d7aa10..896995b 100644 --- a/modes/magit/evil-collection-magit.el +++ b/modes/magit/evil-collection-magit.el @@ -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") |