masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 11:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from killdash9/keymap

Browse source 
minor fixes to get bind-keymap working in 2.0
GitHub-reference: https://github.com/jwiegley/use-package/issues/176
This commit is contained in:
John Wiegley 2015-03-17 10:20:48 -05:00
commit c819beebf0
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/use-package/use-package.el
View file

@ -384,14 +384,14 @@ possible."
`(bind-key ,(car binding) `(bind-key ,(car binding)
#'(lambda () (interactive) #'(lambda () (interactive)
(use-package-autoload-keymap (use-package-autoload-keymap
',(cdr binding) ,name-symbol nil)))) ',(cdr binding) (quote ,name-symbol) nil))))
(plist-get args :bind-keymap)) (plist-get args :bind-keymap))
(mapcar #'(lambda (binding) (mapcar #'(lambda (binding)
`(bind-key ,(car binding) `(bind-key ,(car binding)
#'(lambda () (interactive) #'(lambda () (interactive)
(use-package-autoload-keymap (use-package-autoload-keymap
',(cdr binding) ,name-symbol t)))) ',(cdr binding) (quote ,name-symbol) t))))
(plist-get args :bind-keymap*)) (plist-get args :bind-keymap*))
(mapcar #'(lambda (mode) (mapcar #'(lambda (mode)
@ -416,7 +416,9 @@ possible."
;; Should we defer loading of the package lazily? ;; Should we defer loading of the package lazily?
(defer-loading (and (not (plist-get args :demand)) (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 ;; These are all the configurations to be made after the package has
;; loaded. ;; loaded.