diff options
| author | John Wiegley <johnw@newartisans.com> | 2017-11-28 11:14:30 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2017-11-28 11:14:30 -0800 |
| commit | 4ddf42185a199c99b66f89e903f74a89869cb86a (patch) | |
| tree | 3c51bbde2e86900eaac008dbb0b2ba3dddc22d97 /lisp/use-package | |
| parent | 5ac5f8bc635aa9e9d7729a8d37c093ac4e1d4663 (diff) | |
| download | emacs-4ddf42185a199c99b66f89e903f74a89869cb86a.tar.gz emacs-4ddf42185a199c99b66f89e903f74a89869cb86a.tar.bz2 emacs-4ddf42185a199c99b66f89e903f74a89869cb86a.zip | |
Explicit :defer t should override use-package-always-demand
Fixes https://github.com/jwiegley/use-package/issues/514
Diffstat (limited to 'lisp/use-package')
| -rw-r--r-- | lisp/use-package/use-package.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index e8acf5271f2..26ede8483fd 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -1650,10 +1650,12 @@ this file. Usage: (let ((body (macroexp-progn (use-package-process-keywords name - (if use-package-always-demand + (if (and use-package-always-demand + (not (memq :defer args))) (append args '(:demand t)) args) - (and use-package-always-defer (list :deferred t)))))) + (and use-package-always-defer + (list :deferred t)))))) (if use-package-debug (display-buffer (save-current-buffer |