From 82e0d040722411b2bb4d4101287ff627cb3474d7 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 1 Sep 2024 11:29:36 +0200 Subject: [PATCH] Fix broken use-package tests * lisp/use-package/use-package-core.el (use-package-keywords): Change keyword order to match the one before adding :pin, :ensure, :delight, and :diminish directly to this list. This fixes some broken unit tests. (cherry picked from commit bca315aa4c44f4dc0feb0324e5e8c2f7b599fec8) --- lisp/use-package/use-package-core.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 2d37a93a7cf..cb9e54bd9da 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -69,17 +69,15 @@ "This version of `use-package'.") (defcustom use-package-keywords - '(:disabled + '(:pin + :ensure + :disabled :load-path :requires :defines :functions :preface :if :when :unless - :ensure - :pin - :delight - :diminish :vc :no-require :catch @@ -105,7 +103,9 @@ :load ;; This must occur almost last; the only forms which should appear after ;; are those that must happen directly after the config forms. - :config) + :config + :diminish + :delight) "The set of valid keywords, in the order they are processed in. The order of this list is *very important*, so it is only advisable to insert new keywords, never to delete or reorder -- 2.39.5