From 4ddf42185a199c99b66f89e903f74a89869cb86a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 28 Nov 2017 11:14:30 -0800 Subject: [PATCH] Explicit :defer t should override use-package-always-demand Fixes https://github.com/jwiegley/use-package/issues/514 --- lisp/use-package/use-package.el | 6 ++++-- 1 file 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 -- 2.39.2