Merge pull request #916 from seanfarley/smf/minor-fixes

magit: only implement leader key logic when doom-leader-key is non-nil
This commit is contained in:
Henrik Lissner 2018-09-28 21:16:17 -04:00 committed by GitHub
commit ad3024ae9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,8 +47,8 @@ available.")
;; Don't replace the leader key ;; Don't replace the leader key
;; FIXME remove me when general.el is integrated ;; FIXME remove me when general.el is integrated
(define-key magit-diff-mode-map (kbd doom-leader-key) nil)) (when doom-leader-key
(define-key magit-diff-mode-map (kbd doom-leader-key) nil)))
(def-package! magit-todos (def-package! magit-todos
:hook (magit-mode . magit-todos-mode) :hook (magit-mode . magit-todos-mode)