From 0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2 Mon Sep 17 00:00:00 2001 From: John Lee Date: Sat, 9 May 2020 23:35:15 +0100 Subject: [PATCH] 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 --- lisp/use-package/use-package-core.el | 5 +++-- test/lisp/use-package/use-package-tests.el | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index f547fcfa5ae..220927b082b 100644 --- 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 d92a818cdbe..61438185373 100644 --- 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)))) -- 2.39.2