summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Nguyen <james@jojojames.com>2020-11-25 13:10:40 -0800
committerJames Nguyen <james@jojojames.com>2020-11-25 13:10:40 -0800
commit2cf81f91ea97097451bfd40dd6351338d190a64c (patch)
tree57d41f1211008f552f172d59cdc6ff5561cd96f7
parente24469514a30dd55e65d2c6d90264f496cf4d27f (diff)
Magit: Use kbd with S-SPC and S-DEL (#406)
-rw-r--r--modes/magit/evil-collection-magit.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/modes/magit/evil-collection-magit.el b/modes/magit/evil-collection-magit.el
index ceea12d..05538b7 100644
--- a/modes/magit/evil-collection-magit.el
+++ b/modes/magit/evil-collection-magit.el
@@ -290,8 +290,11 @@ moment.")
;; (,states magit-log-mode-map "-" magit-log-half-commit-limit "-")
(,states magit-log-mode-map "=" magit-log-toggle-commit-limit "=")
- (,states magit-mode-map "S-SPC" magit-diff-show-or-scroll-up "SPC")
- (,states magit-mode-map "S-DEL" magit-diff-show-or-scroll-down "DEL")
+ ;; https://github.com/emacs-evil/evil-collection/issues/406
+ ;; Use kbd here for S-SPC and S-DEL so evil-collection-define-key can
+ ;; parse definition correctly;.
+ (,states magit-mode-map ,(kbd "S-SPC") magit-diff-show-or-scroll-up "SPC")
+ (,states magit-mode-map ,(kbd "S-DEL") magit-diff-show-or-scroll-down "DEL")
((,evil-collection-magit-state) magit-mode-map ,evil-toggle-key evil-emacs-state)
((,evil-collection-magit-state) magit-mode-map "<escape>" magit-mode-bury-buffer))