diff options
| author | John Lee | 2020-05-09 23:35:15 +0100 |
|---|---|---|
| committer | John Lee | 2020-05-09 23:46:53 +0100 |
| commit | 0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2 (patch) | |
| tree | 5ecd251c5e3a553d95c1ea84c1ffca7b1fdd337a | |
| parent | f30d5761af12836844b2e3e8da11f649a31d8abf (diff) | |
| download | emacs-0ec4660f74e6a182ce8be207f0e9a4cc1a59b9a2.tar.gz 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
| -rw-r--r-- | lisp/use-package/use-package-core.el | 5 | ||||
| -rw-r--r-- | 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." | |||
| 156 | :group 'use-package) | 156 | :group 'use-package) |
| 157 | 157 | ||
| 158 | (defcustom use-package-defaults | 158 | (defcustom use-package-defaults |
| 159 | '((:config nil t) | 159 | '(;; this '(t) has special meaning; see `use-package-handler/:config' |
| 160 | (:config '(t) t) | ||
| 160 | (:init nil t) | 161 | (:init nil t) |
| 161 | (:catch t (lambda (name args) | 162 | (:catch t (lambda (name args) |
| 162 | (not use-package-expand-minimally))) | 163 | (not use-package-expand-minimally))) |
| @@ -1467,7 +1468,7 @@ no keyword implies `:all'." | |||
| 1467 | (use-package-concat | 1468 | (use-package-concat |
| 1468 | (when use-package-compute-statistics | 1469 | (when use-package-compute-statistics |
| 1469 | `((use-package-statistics-gather :config ',name nil))) | 1470 | `((use-package-statistics-gather :config ',name nil))) |
| 1470 | (if (and (null arg) (not use-package-inject-hooks)) | 1471 | (if (and (or (null arg) (equal arg '(t))) (not use-package-inject-hooks)) |
| 1471 | body | 1472 | body |
| 1472 | (use-package-with-elapsed-timer | 1473 | (use-package-with-elapsed-timer |
| 1473 | (format "Configuring package %s" name-symbol) | 1474 | (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 @@ | |||
| 1501 | (require 'foo nil nil) | 1501 | (require 'foo nil nil) |
| 1502 | (when | 1502 | (when |
| 1503 | (run-hook-with-args-until-failure 'use-package--foo--pre-config-hook) | 1503 | (run-hook-with-args-until-failure 'use-package--foo--pre-config-hook) |
| 1504 | t | ||
| 1504 | (run-hooks 'use-package--foo--post-config-hook)) | 1505 | (run-hooks 'use-package--foo--post-config-hook)) |
| 1505 | t)))) | 1506 | t)))) |
| 1506 | 1507 | ||