dev: merge branch 'master' into emenel
This commit is contained in:
commit
d02c7a8b4c
25 changed files with 250 additions and 932 deletions
|
@ -15,6 +15,12 @@
|
|||
"An alternative leader prefix key, used for Insert and Emacs states, and for
|
||||
non-evil users.")
|
||||
|
||||
(defvar doom-leader-key-states '(normal visual motion)
|
||||
"which evil modes to activate the leader key for")
|
||||
|
||||
(defvar doom-leader-alt-key-states '(emacs insert)
|
||||
"which evil modes to activate the alternative leader key for")
|
||||
|
||||
(defvar doom-localleader-key "SPC m"
|
||||
"The localleader prefix key, for major-mode specific commands.")
|
||||
|
||||
|
@ -259,12 +265,9 @@ localleader prefix."
|
|||
(set-keymap-parent doom-leader-map mode-specific-map))
|
||||
((equal doom-leader-alt-key "C-x")
|
||||
(set-keymap-parent doom-leader-map ctl-x-map)))
|
||||
(define-key map (kbd doom-leader-alt-key) #'doom-leader-map)
|
||||
(define-key map (kbd doom-localleader-alt-key) #'doom-localleader-map))
|
||||
(evil-define-key* '(normal visual motion) map (kbd doom-leader-key) #'doom-leader-map)
|
||||
(evil-define-key* '(emacs insert) map (kbd doom-leader-alt-key) #'doom-leader-map)
|
||||
(evil-define-key* '(normal visual motion) map (kbd doom-localleader-key) #'doom-localleader-map)
|
||||
(evil-define-key* '(emacs insert) map (kbd doom-localleader-alt-key) #'doom-localleader-map))
|
||||
(define-key map (kbd doom-leader-alt-key) 'doom/leader))
|
||||
(evil-define-key* doom-leader-key-states map (kbd doom-leader-key) 'doom/leader)
|
||||
(evil-define-key* doom-leader-alt-key-states map (kbd doom-leader-alt-key) 'doom/leader))
|
||||
(general-override-mode +1))))
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue