mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

A final fix to :ensure + :load-path

Browse Source 
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
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/use-package/use-package.el
View File

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