Fix undefined var
during loading of magit
This commit is contained in:
parent
43ba398450
commit
d69d2284f7
|
@ -49,7 +49,14 @@
|
||||||
(when (spacemacs//support-evilified-buffer-p dotspacemacs-editing-style)
|
(when (spacemacs//support-evilified-buffer-p dotspacemacs-editing-style)
|
||||||
(evil-magit-init))
|
(evil-magit-init))
|
||||||
(evil-define-key 'motion magit-mode-map
|
(evil-define-key 'motion magit-mode-map
|
||||||
(kbd dotspacemacs-leader-key) spacemacs-default-map)))
|
(kbd dotspacemacs-leader-key) spacemacs-default-map)
|
||||||
|
;; Remove inherited bindings from evil-mc and evil-easymotion
|
||||||
|
;; do this after the config to make sure the keymap is available
|
||||||
|
(which-key-add-keymap-based-replacements magit-mode-map
|
||||||
|
"<normal-state> g r" nil
|
||||||
|
"<visual-state> g r" nil
|
||||||
|
"<normal-state> g s" nil
|
||||||
|
"<visual-state> g s" nil)))
|
||||||
|
|
||||||
(defun git/init-evil-magit ()
|
(defun git/init-evil-magit ()
|
||||||
(use-package evil-magit
|
(use-package evil-magit
|
||||||
|
@ -148,14 +155,6 @@
|
||||||
(spacemacs/set-leader-keys
|
(spacemacs/set-leader-keys
|
||||||
"gfi" 'gitignore-templates-new-file)))
|
"gfi" 'gitignore-templates-new-file)))
|
||||||
|
|
||||||
(defun git/post-init-magit ()
|
|
||||||
;; Remove inherited bindings from evil-mc and evil-easymotion
|
|
||||||
(which-key-add-keymap-based-replacements magit-mode-map
|
|
||||||
"<normal-state> g r" nil
|
|
||||||
"<visual-state> g r" nil
|
|
||||||
"<normal-state> g s" nil
|
|
||||||
"<visual-state> g s" nil))
|
|
||||||
|
|
||||||
(defun git/init-magit ()
|
(defun git/init-magit ()
|
||||||
(use-package magit
|
(use-package magit
|
||||||
:defer (spacemacs/defer)
|
:defer (spacemacs/defer)
|
||||||
|
|
Loading…
Reference in a new issue