summaryrefslogtreecommitdiff
path: root/lisp/use-package
diff options
context:
space:
mode:
authorJohn Lee <jjl@pobox.com>2020-05-09 23:35:15 +0100
committerJohn Lee <jjl@pobox.com>2020-05-09 23:46:53 +0100
commit0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2 (patch)
tree5ecd251c5e3a553d95c1ea84c1ffca7b1fdd337a /lisp/use-package
parentf30d5761af12836844b2e3e8da11f649a31d8abf (diff)
downloademacs-0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2.tar.gz
emacs-0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2.tar.bz2
emacs-0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2.zip
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
Diffstat (limited to 'lisp/use-package')
-rw-r--r--lisp/use-package/use-package-core.el5
1 files changed, 3 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)