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 raxod502/fix-bind-key-filter

Browse source 
Don't mutilate keyword arguments in :bind
GitHub-reference: https://github.com/jwiegley/use-package/issues/447
This commit is contained in:
John Wiegley 2017-04-03 12:34:01 -07:00 • committed by GitHub
commit 2db2b56b17
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -964,12 +964,34 @@ If RECURSED is non-nil, recurse into sublists."
((use-package-is-pair arg key-pred val-pred) ((use-package-is-pair arg key-pred val-pred)
(list arg)) (list arg))
((and (not recursed) (listp arg) (listp (cdr arg))) ((and (not recursed) (listp arg) (listp (cdr arg)))
(mapcar #'(lambda (x) (let ((last-item nil))
(let ((ret (use-package-normalize-pairs (mapcar #'(lambda (x)
key-pred val-pred name label x t))) (prog1
(if (listp ret) (let ((ret (use-package-normalize-pairs
(car ret) key-pred val-pred name label x t)))
ret))) arg)) ;; Currently, the handling of keyword
;; arguments by `use-package' and `bind-key'
;; is non-uniform and undocumented. As a
;; result, `use-package-normalize-pairs' (as
;; it is currently implemented) does not
;; correctly handle the keyword-argument
;; syntax of `bind-keys'. A permanent solution
;; to this problem will require a careful
;; consideration of the desired
;; keyword-argument interface for
;; `use-package' and `bind-key'. However, in
;; the meantime, we have a quick patch to fix
;; a serious bug in the handling of keyword
;; arguments. Namely, the code below would
;; normally unwrap lists that were passed as
;; keyword arguments (for example, the
;; `:filter' argument in `:bind') without
;; the (not (keywordp last-item)) clause. See
;; #447 for further discussion.
(if (and (listp ret) (not (keywordp last-item)))
(car ret)
ret))
(setq last-item x))) arg)))
(t arg))) (t arg)))
(defun use-package-normalize-binder (name keyword args) (defun use-package-normalize-binder (name keyword args)