* elmo-pipe.el (elmo-pipe-drain): Use `unwind-protect';

Hide progress gauge if `elmo-folder-move-messages' exits
nonlocally.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c640973..666cfc4 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-10  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-pipe.el (elmo-pipe-drain): Use `unwind-protect';
+       Hide progress gauge if `elmo-folder-move-messages' exits
+       nonlocally.
+
 2001-10-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-imap4.el (elmo-folder-initialize): Use

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 7d212e6..f88e29a 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -106,8 +106,9 @@
     (when (> len elmo-display-progress-threshold)
       (elmo-progress-set 'elmo-folder-move-messages
                         len "Moving messages..."))
-    (elmo-folder-move-messages src msgs dst)
-    (elmo-progress-clear 'elmo-folder-move-messages))
+    (unwind-protect
+       (elmo-folder-move-messages src msgs dst)
+      (elmo-progress-clear 'elmo-folder-move-messages)))
   ;; Don't save msgdb here.
   ;; Because summary view of original folder is not updated yet.
   (elmo-folder-close-internal src)
@@ -133,7 +134,7 @@
   ((folder elmo-pipe-folder) unread-marks &optional mark-alist)
   (elmo-folder-list-unreads-internal (elmo-pipe-folder-dst-internal folder)
                                     unread-marks mark-alist))
-  
+
 (luna-define-method elmo-folder-list-importants-internal
   ((folder elmo-pipe-folder) important-mark)
   (elmo-folder-list-importants-internal (elmo-pipe-folder-dst-internal folder)