diff options
| author | Thomas Frössman <thomasf@jossystem.se> | 2015-03-14 17:53:02 +0100 |
|---|---|---|
| committer | Thomas Frössman <thomasf@jossystem.se> | 2015-03-15 02:18:59 +0100 |
| commit | e68d00d525934fbadc0cde3f5150f79b366e36db (patch) | |
| tree | d8fec0a95b738c4d77cd9bc22daa0596350d37cb /lisp/use-package | |
| parent | 4ae584f3ff0e9bda05420ec3b8598e59374b0899 (diff) | |
| download | emacs-e68d00d525934fbadc0cde3f5150f79b366e36db.tar.gz emacs-e68d00d525934fbadc0cde3f5150f79b366e36db.tar.bz2 emacs-e68d00d525934fbadc0cde3f5150f79b366e36db.zip | |
Fix :ensure value interpretation
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 75d5ee6187c..e0a19f0dde4 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -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)) |