Move :init back to happening after all autoloads have occurred

Fixes https://github.com/jwiegley/use-package/issues/535

diff --git a/up-core.el b/up-core.el
index d809970cdb733d0bdc02845717eb469a6257e9c0..b78c619c003336eb6aea3ab28ec21276745aba75 100644 (file)
--- a/up-core.el
+++ b/up-core.el
@@ -66,7 +66,6 @@
     :after
     :custom
     :custom-face
-    :init
     :bind
     :bind*
     :bind-keymap
@@ -79,6 +78,7 @@
     ;; Any other keyword that also declares commands to be autoloaded (such as
     ;; :bind) must appear before this keyword.
     :commands
+    :init
     :defer
     :demand
     :load

diff --git a/up-tests.el b/up-tests.el
index 8de058c4512a80a70d0cb76e40666d1a21db93c7..33b4365431353be465ac399588dc38f2dd340c9e 100644 (file)
--- a/up-tests.el
+++ b/up-tests.el
@@ -662,6 +662,15 @@
         (eval-when-compile
           (declare-function quux "foo"))))))
 
+(ert-deftest use-package-test/:commands-4 ()
+  (match-expansion
+   (use-package foo :commands bar :init (bar))
+   `(progn
+      (unless
+          (fboundp 'bar)
+        (autoload #'bar "foo" nil t))
+      (bar))))
+
 (ert-deftest use-package-test/:defines-1 ()
   (match-expansion
    (use-package foo :defines bar)