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

Merge pull request from waymondo/master

Browse source 
Allow string values in cons for :bind keywords
GitHub-reference: https://github.com/jwiegley/use-package/issues/303
This commit is contained in:
John Wiegley 2016-02-09 19:31:48 -05:00
commit 416096bfdc
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -651,8 +651,14 @@ manually updated package."
(and allow-vector (vectorp (car x))))
(symbolp (cdr x))))
(defsubst use-package-is-string-pair (x)
"Return t if X has the type (STRING . STRING)."
(and (consp x)
(stringp (car x))
(stringp (cdr x))))
(defun use-package-normalize-pairs
(name label arg &optional recursed allow-vector)
(name label arg &optional recursed allow-vector allow-string-cdrs)
"Normalize a list of string/symbol pairs."
(cond
((or (stringp arg) (and allow-vector (vectorp arg)))
@ -662,16 +668,18 @@ manually updated package."
((and (not recursed) (listp arg) (listp (cdr arg)))
(mapcar #'(lambda (x)
(let ((ret (use-package-normalize-pairs
name label x t allow-vector)))
name label x t allow-vector allow-string-cdrs)))
(if (listp ret)
(car ret)
ret))) arg))
((and allow-string-cdrs (use-package-is-string-pair arg))
(list arg))
(t arg)))
(defun use-package-normalize-binder (name keyword args)
(use-package-as-one (symbol-name keyword) args
(lambda (label arg)
(use-package-normalize-pairs name label arg nil t))))
(use-package-normalize-pairs name label arg nil t t))))
(defalias 'use-package-normalize/:bind 'use-package-normalize-binder)
(defalias 'use-package-normalize/:bind* 'use-package-normalize-binder)
@ -857,12 +865,13 @@ deferred until the prefix key sequence is pressed."
(apply
#'nconc
(mapcar #'(lambda (command)
(append
`((unless (fboundp ',command)
(autoload #',command ,name-string nil t)))
(when (bound-and-true-p byte-compile-current-file)
`((eval-when-compile
(declare-function ,command ,name-string))))))
(when (not (stringp command))
(append
`((unless (fboundp ',command)
(autoload #',command ,name-string nil t)))
(when (bound-and-true-p byte-compile-current-file)
`((eval-when-compile
(declare-function ,command ,name-string)))))))
(delete-dups (plist-get state :commands))))
body)))