From: Russell Black <black.russell@gmail.com>
Date: Tue, 17 Mar 2015 04:55:48 +0000 (-0600)
Subject: minor fixes to get bind-keymap working in 2.0
X-Git-Tag: emacs-29.0.90~1306^2~15^2~373^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d7a0c21852db1a0ef97204786b90b6e77a70c37;p=emacs.git

minor fixes to get bind-keymap working in 2.0
---

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 561b12d74a5..2fae2a2f3ec 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -384,14 +384,14 @@ possible."
                      `(bind-key ,(car binding)
                                 #'(lambda () (interactive)
                                     (use-package-autoload-keymap
-                                     ',(cdr binding) ,name-symbol nil))))
+                                     ',(cdr binding) (quote ,name-symbol) nil))))
                  (plist-get args :bind-keymap))
 
          (mapcar #'(lambda (binding)
                      `(bind-key ,(car binding)
                                 #'(lambda () (interactive)
                                     (use-package-autoload-keymap
-                                     ',(cdr binding) ,name-symbol t))))
+                                     ',(cdr binding) (quote ,name-symbol) t))))
                  (plist-get args :bind-keymap*))
 
          (mapcar #'(lambda (mode)
@@ -416,7 +416,9 @@ possible."
 
        ;; Should we defer loading of the package lazily?
        (defer-loading (and (not (plist-get args :demand))
-                           (or commands deferral)))
+                           (or commands deferral
+                               (plist-get args :bind-keymap)
+                               (plist-get args :bind-keymap*))))
 
        ;; These are all the configurations to be made after the package has
        ;; loaded.