diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-03-17 10:20:48 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-03-17 10:20:48 -0500 |
| commit | c819beebf02ed6db544ac5b0099a7b2822f0dfae (patch) | |
| tree | a038cf530a23f1c5a5b31743f690452dc5208d4b /lisp/use-package/use-package.el | |
| parent | 771f2edc83a2d48e9d46975c6433c4f16f449a7b (diff) | |
| parent | 8d7a0c21852db1a0ef97204786b90b6e77a70c37 (diff) | |
| download | emacs-c819beebf02ed6db544ac5b0099a7b2822f0dfae.tar.gz emacs-c819beebf02ed6db544ac5b0099a7b2822f0dfae.tar.bz2 emacs-c819beebf02ed6db544ac5b0099a7b2822f0dfae.zip | |
Merge pull request from killdash9/keymap
minor fixes to get bind-keymap working in 2.0
GitHub-reference: https://github.com/jwiegley/use-package/issues/176
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 8 |
1 files changed, 5 insertions, 3 deletions
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. |