1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

A final fix to :ensure + :load-path

Fixes https://github.com/jwiegley/use-package/issues/190
This commit is contained in:
John Wiegley 2017-11-30 12:38:13 -08:00
parent ca94036dce
commit 0be868d39b

View File

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