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)

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 2d37a93a7cf416456435fd2f39ed2ca74fa7da43..cb9e54bd9dae5dae5e58728ae001aa915b4541db 100644 (file)
--- 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