(elmo-with-progress-display): Return the value of the last form in `body'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index e52bb40..725a3f3 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Tetsurou Okazaki  <okazaki@be.to>
+
+       * elmo-util.el (elmo-with-progress-display): Return the value
+       of the last form in `body'.
+
 2006-11-07  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-util.el (elmo-progress-start): Accept nil for `total'.  Set

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index c744ff3..12dfe07 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1241,11 +1241,12 @@ SPEC is a list as followed (LABEL TOTAL [VAR])."
        (total (nth 1 spec))
        (var (or (nth 2 spec) (make-symbol "--elmo-progress-temp--"))))
     `(let ((,var (elmo-progress-start (quote ,label) ,total ,message)))
-       (unwind-protect
-          (progn
-            ,@body)
-        (elmo-progress-clear ,var))
-       (elmo-progress-done ,var))))
+       (prog1
+          (unwind-protect
+              (progn
+                ,@body)
+            (elmo-progress-clear ,var))
+        (elmo-progress-done ,var)))))
 
 (put 'elmo-with-progress-display 'lisp-indent-function '2)
 (def-edebug-spec elmo-with-progress-display