mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
Merge pull request from thomasf/master
Fix :ensure value interpretation GitHub-reference: https://github.com/jwiegley/use-package/issues/163
This commit is contained in:
commit
a6edb08122
@ -234,12 +234,22 @@ then the expanded macros do their job silently."
|
||||
(use-package-as-one (symbol-name head) args
|
||||
#'use-package-normalize-symbols))
|
||||
|
||||
((or :defer :demand :disabled :ensure)
|
||||
((or :defer :demand :disabled)
|
||||
(if (null args)
|
||||
t
|
||||
(use-package-only-one (symbol-name head) args
|
||||
#'use-package-normalize-value)))
|
||||
|
||||
(:ensure
|
||||
(use-package-only-one (symbol-name head) args
|
||||
(if (null args)
|
||||
t
|
||||
(lambda (label arg)
|
||||
(if (symbolp arg)
|
||||
arg
|
||||
(use-package-error
|
||||
":ensure wants an optional package name (a unquoted symbol name)"))))))
|
||||
|
||||
((or :if :when :unless)
|
||||
(use-package-only-one (symbol-name head) args
|
||||
#'use-package-normalize-value))
|
||||
|
Loading…
Reference in New Issue
Block a user