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

Merge pull request from nickalcock/master

Browse source 
Support :bind (:map '(...)).
GitHub-reference: https://github.com/jwiegley/use-package/issues/235
This commit is contained in:
John Wiegley 2015-07-31 23:30:30 -07:00
commit 282241cf7d
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -629,11 +629,13 @@ manually updated package."
((use-package-is-sympair arg allow-vector) ((use-package-is-sympair arg allow-vector)
(list arg)) (list arg))
((and (not recursed) (listp arg) (listp (cdr arg))) ((and (not recursed) (listp arg) (listp (cdr arg)))
(mapcar #'(lambda (x) (car (use-package-normalize-pairs (mapcar #'(lambda (x)
name-symbol label x t allow-vector))) arg)) (let ((ret (use-package-normalize-pairs
(t name-symbol label x t allow-vector)))
(use-package-error (if (listp ret)
(concat label " wants a string, (string . symbol) or list of these"))))) (car ret)
ret))) arg))
(t arg)))
(defun use-package-normalize-binder (name-symbol keyword args) (defun use-package-normalize-binder (name-symbol keyword args)
(use-package-as-one (symbol-name keyword) args (use-package-as-one (symbol-name keyword) args
@ -645,7 +647,10 @@ manually updated package."
(defun use-package-handler/:bind (defun use-package-handler/:bind
(name-symbol keyword arg rest state &optional override) (name-symbol keyword arg rest state &optional override)
(let ((commands (mapcar #'cdr arg))) (let ((commands (remq nil (mapcar #'(lambda (arg)
(if (listp arg)
(cdr arg)
nil)) arg))))
(use-package-concat (use-package-concat
(use-package-process-keywords name-symbol (use-package-process-keywords name-symbol
(use-package-sort-keywords (use-package-sort-keywords