diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-12-01 11:30:11 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2017-12-01 11:30:11 -0800 |
| commit | 09be976c1852fa5d36fe26794c43ad48a4ea12ee (patch) | |
| tree | c4c22034eb1f15554aee4089ca850946ae58899e /lisp/use-package/use-package.el | |
| parent | 9e8e9aa4eed75b23231f8593d57c257be92cda49 (diff) | |
| download | emacs-09be976c1852fa5d36fe26794c43ad48a4ea12ee.tar.gz emacs-09be976c1852fa5d36fe26794c43ad48a4ea12ee.tar.bz2 emacs-09be976c1852fa5d36fe26794c43ad48a4ea12ee.zip | |
:demand should not override an explicit use of :after
Fixes https://github.com/jwiegley/use-package/issues/529
Diffstat (limited to 'lisp/use-package/use-package.el')
| -rw-r--r-- | lisp/use-package/use-package.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 4e652649861..5119e394ebe 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -1768,6 +1768,10 @@ this file. Usage: (not (memq :defer args))) (plist-put args :demand t) args)))) + ;; The :demand keyword should not override :after + (if (and (plist-member args* :after) + (plist-member args* :demand)) + (setq args* (use-package-plist-delete args* :demand))) (when (and use-package-always-ensure (plist-member args* :load-path) (not (plist-member orig-args :ensure))) |