with-elapsed-timer: only check verbosity once

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index eb3c70301084f739a20272df6a74150451980ef6..33aa332fd165d8606877c29d6a84accef89e7801 100644 (file)
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -321,18 +321,16 @@
   :group 'use-package)
 
 (defmacro with-elapsed-timer (text &rest forms)
-  `(let ((now ,(if use-package-verbose
-                   '(current-time))))
-     ,(if use-package-verbose
-          `(message "%s..." ,text))
-     (prog1
-         ,@forms
-       ,(when use-package-verbose
-          `(let ((elapsed
-                  (float-time (time-subtract (current-time) now))))
-             (if (> elapsed ,use-package-minimum-reported-time)
-                 (message "%s...done (%.3fs)" ,text elapsed)
-               (message "%s...done" ,text)))))))
+  (if use-package-verbose
+    `(let ((now (current-time)))
+       (message "%s..." ,text)
+       (prog1 ,@forms
+         (let ((elapsed
+                (float-time (time-subtract (current-time) now))))
+           (if (> elapsed ,use-package-minimum-reported-time)
+               (message "%s...done (%.3fs)" ,text elapsed)
+             (message "%s...done" ,text)))))
+    `(prog1 ,@forms)))
 
 (put 'with-elapsed-timer 'lisp-indent-function 1)