From: Mattias Engdegård <mattiase@acm.org>
Date: Sun, 11 Dec 2022 15:26:50 +0000 (+0100)
Subject: Fix use-package-defaults defcustom type (bug#59941)
X-Git-Tag: emacs-29.0.90~1237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4893a15631743e1d885bd09b9184bc112c7eadcb;p=emacs.git

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.
---

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)