TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix undefined var during loading of magit

Browse source
This commit is contained in:
Maximilian Wolff 2020-11-28 07:40:59 +00:00
parent 43ba398450
commit d69d2284f7
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
layers/+source-control/git/packages.el
View file

@ -49,7 +49,14 @@
(when (spacemacs//support-evilified-buffer-p dotspacemacs-editing-style)
(evil-magit-init))
(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 ()
(use-package evil-magit
@ -148,14 +155,6 @@
(spacemacs/set-leader-keys
"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 ()
(use-package magit
:defer (spacemacs/defer)