From: John Wiegley <johnw@newartisans.com>
Date: Tue, 28 Nov 2017 19:14:30 +0000 (-0800)
Subject: Explicit :defer t should override use-package-always-demand
X-Git-Tag: emacs-29.0.90~1306^2~15^2~251
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ddf42185a;p=emacs.git

Explicit :defer t should override use-package-always-demand

Fixes https://github.com/jwiegley/use-package/issues/514
---

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