Add special value back again, in case needed for backwards compat

I don't know why this special value exists, but perhaps old client code uses it.

The additional `t' in the macro expansion is accidental but not harmful I guess.

Copyright-paperwork-exempt: yes

diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index f547fcfa5ae75be082900b7f9dab0b177968d377..220927b082b796aa24dabf1e8d307e504ef8f19e 100644 (file)
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -156,7 +156,8 @@ See also `use-package-defaults', which uses this value."
   :group 'use-package)
 
 (defcustom use-package-defaults
-  '((:config nil t)
+  '(;; this '(t) has special meaning; see `use-package-handler/:config'
+    (:config '(t) t)
     (:init nil t)
     (:catch t (lambda (name args)
                 (not use-package-expand-minimally)))
@@ -1467,7 +1468,7 @@ no keyword implies `:all'."
     (use-package-concat
      (when use-package-compute-statistics
        `((use-package-statistics-gather :config ',name nil)))
-     (if (and (null arg) (not use-package-inject-hooks))
+     (if (and (or (null arg) (equal arg '(t))) (not use-package-inject-hooks))
          body
        (use-package-with-elapsed-timer
            (format "Configuring package %s" name-symbol)

diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index d92a818cdbeabe3675871e95a9838142d242e077..6143818537380b848d663374325685b6297d0f07 100644 (file)
--- a/test/lisp/use-package/use-package-tests.el
+++ b/test/lisp/use-package/use-package-tests.el
@@ -1501,6 +1501,7 @@
         (require 'foo nil nil)
         (when
             (run-hook-with-args-until-failure 'use-package--foo--pre-config-hook)
+          t
           (run-hooks 'use-package--foo--post-config-hook))
         t))))