use-package-with-elapsed-timer: respect option at runtime

Previously the option `use-package-verbose' was consulted at macro
expansion time, and as a result customizing the option did nothing,
without also recompiling `use-package.el'.

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 45d361a4dd84f2859f51c4bd311411470a4b5e9f..473eefb50908c8177274c4d26c8b460b150222f3 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -58,19 +58,18 @@
   :type 'number
   :group 'use-package)
 
-(defmacro use-package-with-elapsed-timer (text &rest forms)
-  (let ((body `(progn ,@forms)))
-    (if use-package-verbose
-        (let ((nowvar (make-symbol "now")))
-          `(let ((,nowvar (current-time)))
-             (message "%s..." ,text)
-             (prog1 ,body
-               (let ((elapsed
-                      (float-time (time-subtract (current-time) ,nowvar))))
-                 (if (> elapsed ,use-package-minimum-reported-time)
-                     (message "%s...done (%.3fs)" ,text elapsed)
-                   (message "%s...done" ,text))))))
-      body)))
+(defmacro use-package-with-elapsed-timer (text &rest body)
+  (let ((nowvar (make-symbol "now")))
+    `(if use-package-verbose
+         (let ((,nowvar (current-time)))
+           (message "%s..." ,text)
+           (prog1 (progn ,@body)
+             (let ((elapsed
+                    (float-time (time-subtract (current-time) ,nowvar))))
+               (if (> elapsed ,use-package-minimum-reported-time)
+                   (message "%s...done (%.3fs)" ,text elapsed)
+                 (message "%s...done" ,text)))))
+       ,@body)))
 
 (put 'use-package-with-elapsed-timer 'lisp-indent-function 1)