1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/acdw.el b/lisp/acdw.el
index 262c15e..603f46f 100644
--- a/lisp/acdw.el
+++ b/lisp/acdw.el

@@ -128,10 +128,12 @@ I keep forgetting how they differ."
 (defmacro +with-message (message &rest body)
  "Execute BODY, with MESSAGE.
 If body executes without errors, MESSAGE...Done will be displayed."
-  ;; ^ TODO
+  (declare (indent 1))
-  `(prog1 (progn (message ,(concat message "..."))
+  (let ((msg (gensym)))
-                 ,@body)
+    `(let ((,msg ,message))
-          (message ,(concat message "...Done."))))
+       (unwind-protect (progn (message "%s..." ,msg)
+                              ,@body)
+         (message "%s... Done." ,msg)))))
 (defun +mapc-some-buffers (func &optional predicate)
  "Perform FUNC on all buffers satisfied by PREDICATE.