From ec84ed0dfbeebb8683330449aa4e476debd2f72c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 9 Dec 2017 16:28:49 -0800 Subject: Fix a scoping issues with multiple occurrences of :bind Fixes https://github.com/jwiegley/use-package/issues/585 --- lisp/use-package/use-package-core.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lisp/use-package/use-package-core.el') diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index e700c1c110b..df65e04b9a0 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -180,7 +180,8 @@ t according to whether defaulting should be attempted." (defcustom use-package-merge-key-alist '((:if . (lambda (new old) `(and ,new ,old))) (:after . (lambda (new old) `(:all ,new ,old))) - (:defer . (lambda (new old) old))) + (:defer . (lambda (new old) old)) + (:bind . (lambda (new old) (append new (list :break) old)))) "Alist of keys and the functions used to merge multiple values. For example, if the following form is provided: @@ -472,6 +473,13 @@ This is in contrast to merely setting it to 0." (nconc ys (list x))))) (cons (cdr ys) (cdr zs)))) +(defun use-package-split-list-at-keys (key lst) + (when lst + (let* ((xs (use-package-split-list (apply-partially #'eq key) lst)) + (args (car xs)) + (tail (cdr xs))) + (cons args (use-package-split-list-at-keys key (cdr tail)))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; Keywords -- cgit v1.2.3