From c9e7d2731792a8412a8f8a91723859fed747ca7f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 8 Mar 2019 14:23:42 -0500 Subject: [PATCH] Set leader keys later #1233 Setting them too soon means the user can't change them. --- core/core-keybinds.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/core-keybinds.el b/core/core-keybinds.el index f96549687..d8ce923ff 100644 --- a/core/core-keybinds.el +++ b/core/core-keybinds.el @@ -90,10 +90,15 @@ If any hook returns non-nil, all hooks after it are ignored.") (define-prefix-command 'doom/leader 'doom-leader-map) (define-key doom-leader-map [override-state] 'all) -(global-set-key (kbd doom-leader-alt-key) 'doom/leader) -(after! evil - (evil-define-key* '(emacs insert) 'global (kbd doom-leader-alt-key) 'doom/leader) - (evil-define-key* '(normal visual motion) 'global (kbd doom-leader-key) 'doom/leader)) +;; Bind `doom-leader-key' and `doom-leader-alt-key' as late as possible to give +;; the user more changes to modify them. +(defun doom|init-leader-keys () + "Bind `doom-leader-key' and `doom-leader-alt-key'." + (global-set-key (kbd doom-leader-alt-key) 'doom/leader) + (when (featurep 'evil) + (evil-define-key* '(emacs insert) 'global (kbd doom-leader-alt-key) 'doom/leader) + (evil-define-key* '(normal visual motion) 'global (kbd doom-leader-key) 'doom/leader))) +(add-hook 'doom-after-init-modules-hook #'doom|init-leader-keys) ;; ...However, this approach (along with :wk-full-keys in `define-leader-key!') ;; means that which-key is only informed of the key sequence *after*