From 4893a15631743e1d885bd09b9184bc112c7eadcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Sun, 11 Dec 2022 16:26:50 +0100 Subject: [PATCH] Fix use-package-defaults defcustom type (bug#59941) * lisp/use-package/use-package-core.el (use-package-defaults): Enlarge type to allow for keywords such as :ensure and :pin to be added later, remedying a failure in test-custom-opts. --- lisp/use-package/use-package-core.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index ed6a65494fa..1dee08e55b2 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -210,9 +210,7 @@ a symbol) and a list of keywords (in normalized form). It should return nil or non-nil depending on whether defaulting should be attempted." :type `(repeat - (list (choice :tag "Keyword" - ,@(mapcar #'(lambda (k) (list 'const k)) - use-package-keywords)) + (list (symbol :tag "Keyword") (choice :tag "Default value" sexp function) (choice :tag "Enable if non-nil" sexp function))) :group 'use-package)