From: Thomas Frössman <thomasf@jossystem.se>
Date: Sat, 14 Mar 2015 16:53:02 +0000 (+0100)
Subject: Fix :ensure value interpretation
X-Git-Tag: emacs-29.0.90~1306^2~15^2~397^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e68d00d525;p=emacs.git

Fix :ensure value interpretation
---

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))