From 448d5fc71f9d64c9aa2e332645fbb65367a6b335 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 19 May 2019 18:32:16 -0400 Subject: [PATCH] map!: fix :prefix-map for non-leader keys Would no-op if used on a non-leader key. --- core/core-keybinds.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/core-keybinds.el b/core/core-keybinds.el index 4fd869613..44dfbb508 100644 --- a/core/core-keybinds.el +++ b/core/core-keybinds.el @@ -280,13 +280,12 @@ For example, :nvi will map to (list 'normal 'visual 'insert). See (cl-destructuring-bind (prefix . desc) (doom-enlist (pop rest)) (let ((keymap (intern (format "doom-leader-%s-map" desc)))) - (push `(progn - (defvar ,keymap (make-sparse-keymap)) - (map! :leader - :desc ,desc ,prefix ,keymap - :prefix ,prefix ,@rest)) - doom--map-forms) - (setq rest nil)))) + (setq rest + (append (list :desc desc prefix keymap + :prefix prefix) + rest)) + (push `(defvar ,keymap (make-sparse-keymap)) + doom--map-forms)))) (:prefix (cl-destructuring-bind (prefix . desc) (doom-enlist (pop rest))