[keyboard-layout] Split evil-magit
and magit
configurations
Fix #10133 and #10229, supersede #10148 Modification as suggested in [1]. [1] https://github.com/syl20bnr/spacemacs/pull/10148#issuecomment-357577446
This commit is contained in:
parent
13961e8ea1
commit
29fa494053
|
@ -19,6 +19,7 @@
|
||||||
evil
|
evil
|
||||||
evil-escape
|
evil-escape
|
||||||
evil-evilified-state
|
evil-evilified-state
|
||||||
|
evil-magit
|
||||||
evil-surround
|
evil-surround
|
||||||
eyebrowse
|
eyebrowse
|
||||||
flycheck
|
flycheck
|
||||||
|
@ -227,6 +228,24 @@
|
||||||
"k"
|
"k"
|
||||||
"l")))
|
"l")))
|
||||||
|
|
||||||
|
(defun keyboard-layout/pre-init-evil-magit ()
|
||||||
|
(kl|config evil-magit
|
||||||
|
:description
|
||||||
|
"Remap `evil-magit' bindings."
|
||||||
|
:loader
|
||||||
|
(with-eval-after-load 'evil-magit BODY)
|
||||||
|
:common
|
||||||
|
(dolist (state (if evil-magit-use-y-for-yank
|
||||||
|
(list evil-magit-state 'visual)
|
||||||
|
(list evil-magit-state)))
|
||||||
|
(kl/evil-correct-keys state magit-mode-map
|
||||||
|
"j"
|
||||||
|
"k"
|
||||||
|
"C-j"
|
||||||
|
"C-k"))
|
||||||
|
(kl/evil-correct-keys 'normal evil-magit-toggle-text-minor-mode-map
|
||||||
|
"C-j")))
|
||||||
|
|
||||||
(defun keyboard-layout/pre-init-evil-surround ()
|
(defun keyboard-layout/pre-init-evil-surround ()
|
||||||
(kl|config evil-surround
|
(kl|config evil-surround
|
||||||
:description
|
:description
|
||||||
|
@ -357,17 +376,6 @@
|
||||||
:loader
|
:loader
|
||||||
(spacemacs|use-package-add-hook magit :post-config BODY)
|
(spacemacs|use-package-add-hook magit :post-config BODY)
|
||||||
:common
|
:common
|
||||||
(progn
|
|
||||||
(dolist (state (if evil-magit-use-y-for-yank
|
|
||||||
(list evil-magit-state 'visual)
|
|
||||||
(list evil-magit-state)))
|
|
||||||
(kl/evil-correct-keys state magit-mode-map
|
|
||||||
"j"
|
|
||||||
"k"
|
|
||||||
"C-j"
|
|
||||||
"C-k"))
|
|
||||||
(kl/evil-correct-keys 'normal evil-magit-toggle-text-minor-mode-map
|
|
||||||
"C-j")
|
|
||||||
(dolist (map (list magit-branch-section-map
|
(dolist (map (list magit-branch-section-map
|
||||||
magit-commit-section-map
|
magit-commit-section-map
|
||||||
magit-file-section-map
|
magit-file-section-map
|
||||||
|
@ -386,17 +394,16 @@
|
||||||
"j"
|
"j"
|
||||||
"k"
|
"k"
|
||||||
"C-j"
|
"C-j"
|
||||||
"C-k")))
|
"C-k"))
|
||||||
:bepo
|
:bepo
|
||||||
(progn
|
(progn
|
||||||
(magit-change-popup-key 'magit-dispatch-popup :actions ?t ?j)
|
(magit-change-popup-key 'magit-dispatch-popup :actions ?t ?j)
|
||||||
(magit-change-popup-key 'magit-dispatch-popup :actions ?s ?k)
|
(magit-change-popup-key 'magit-dispatch-popup :actions ?s ?k)
|
||||||
(magit-change-popup-key 'magit-dispatch-popup :actions ?S ?K))
|
(magit-change-popup-key 'magit-dispatch-popup :actions ?S ?K))
|
||||||
:colemak-jkhl
|
:colemak-jkhl
|
||||||
(progn
|
|
||||||
(kl/evil-correct-keys 'visual magit-mode-map
|
(kl/evil-correct-keys 'visual magit-mode-map
|
||||||
"j"
|
"j"
|
||||||
"k"))))
|
"k")))
|
||||||
|
|
||||||
(defun keyboard-layout/pre-init-mu4e ()
|
(defun keyboard-layout/pre-init-mu4e ()
|
||||||
(kl|config mu4e
|
(kl|config mu4e
|
||||||
|
|
Loading…
Reference in a new issue