From: John Wiegley <johnw@newartisans.com>
Date: Thu, 30 Nov 2017 19:20:17 +0000 (-0800)
Subject: Don't check for an :ensure that use-package-always-ensure may have added
X-Git-Tag: emacs-29.0.90~1306^2~15^2~217
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fc543a212021bc911a082bdfc7cc81eb401c0d4;p=emacs.git

Don't check for an :ensure that use-package-always-ensure may have added

Fixes https://github.com/jwiegley/use-package/issues/190
---

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 850e37be00c..0d86cc00e99 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -1769,8 +1769,7 @@ this file.  Usage:
                                  (append args '(:demand t))
                                args)))
                   (when (and use-package-always-ensure
-                             (plist-member args* :load-path)
-                             (not (plist-member args* :ensure)))
+                             (plist-member args* :load-path))
                     (plist-put args* :ensure nil))
                   (unless (plist-member args* :init)
                     (plist-put args* :init nil))