map!: fix :prefix-map for non-leader keys

Would no-op if used on a non-leader key.
2019-05-19 18:32:16 -04:00 · 2019-05-19 18:32:16 -04:00 · 448d5fc71f
commit 448d5fc71f
parent 482c87308f
1 changed files with 6 additions and 7 deletions
--- 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))