Merge pull request from tarsius/master

use-package-with-elapsed-timer: respect option at runtime
GitHub-reference: https://github.com/jwiegley/use-package/issues/96

1 files changed, 14 insertions, 14 deletions

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 45d361a4dd8..2523921a1f4 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -58,19 +58,19 @@
   :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)
+  (declare (indent 1))
+  (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)
 
@@ -404,7 +404,7 @@ For full documentation. please see commentary.
 (put 'use-package 'lisp-indent-function 'defun)
 
 (defconst use-package-font-lock-keywords
-  '(("(\\(use-package\\)\\_>[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?"
+  '(("(\\(use-package\\(?:-with-elapsed-timer\\)?\\)\\_>[ \t']*\\(\\(?:\\sw\\|\\s_\\)+\\)?"
      (1 font-lock-keyword-face)
      (2 font-lock-constant-face nil t))))