From: teranisi <teranisi>
Date: Thu, 2 Nov 2000 01:29:24 +0000 (+0000)
Subject: * elmo-util.el (elmo-copy-file): Don't cause an error after `add-name-to-file'
X-Git-Tag: wl-2_4-root~16
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c467ca6219272fbbe133ae98c5bcc9e9dffb1742;p=elisp%2Fwanderlust.git

* elmo-util.el (elmo-copy-file): Don't cause an error after `add-name-to-file'
 failed.

* elmo-pipe.el (elmo-pipe-drain): List folder before loading msgdb.
 (Fix by HIROSE Yuuji <yuuji@gentei.org>)
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 8d8b17e..ffccc43 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-02  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-util.el (elmo-copy-file): Don't cause an error after
+	`add-name-to-file' failed.
+
+	* elmo-pipe.el (elmo-pipe-drain): List folder before loading msgdb.
+	(Fix by HIROSE Yuuji <yuuji@gentei.org>)
+
 2000-11-01  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* elmo-version.el (elmo-version): Up to 2.3.93.
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index fd0fb7e..6808574 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -63,13 +63,14 @@
 (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.")
 
 (defun elmo-pipe-drain (src dst)
-  (let ((msgdb (elmo-msgdb-load src))
+  (let ((srclist (elmo-list-folder src))
+	(msgdb (elmo-msgdb-load src))
 	elmo-nntp-use-cache
 	elmo-imap4-use-cache
 	elmo-pop3-use-cache ; Inhibit caching while moving messages.
 	elmo-pop3-use-uidl) ; No need to use UIDL
     (message "Checking %s..." src)
-    (elmo-move-msgs src (elmo-list-folder src) dst msgdb)
+    (elmo-move-msgs src srclist dst msgdb)
     ;; Don't save msgdb here.
     ;; Because summary view of original folder is not updated yet.
     ;; (elmo-msgdb-save src msgdb)
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 917ddc2..c493d00 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1444,8 +1444,7 @@ Emacs 19.28 or earlier does not have `unintern'."
 (defsubst elmo-copy-file (src dst)
   (condition-case err
       (elmo-add-name-to-file src dst t)
-    (error (copy-file src dst t)
-	   (error "Copy file failed"))))
+    (error (copy-file src dst t))))
 
 (defsubst elmo-buffer-exists-p (buffer)
   (if (bufferp buffer)