From: John Wiegley <johnw@newartisans.com>
Date: Thu, 30 Nov 2017 20:38:13 +0000 (-0800)
Subject: A final fix to :ensure + :load-path
X-Git-Tag: emacs-29.0.90~1306^2~15^2~215
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0be868d39b544a00f274eb03305b85f13386e5d2;p=emacs.git

A final fix to :ensure + :load-path

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 0d86cc00e99..748074ad115 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -1734,6 +1734,7 @@ this file.  Usage:
   (declare (indent 1))
   (unless (member :disabled args)
     (let ((name-symbol (if (stringp name) (intern name) name))
+          (orig-args args)
           (args (use-package-normalize-plist name args)))
       (dolist (spec use-package-defaults)
         (setq args (use-package-sort-keywords
@@ -1769,7 +1770,8 @@ this file.  Usage:
                                  (append args '(:demand t))
                                args)))
                   (when (and use-package-always-ensure
-                             (plist-member args* :load-path))
+                             (plist-member args* :load-path)
+                             (not (plist-member orig-args :ensure)))
                     (plist-put args* :ensure nil))
                   (unless (plist-member args* :init)
                     (plist-put args* :init nil))