From: teranisi <teranisi>
Date: Mon, 10 Dec 2001 09:23:44 +0000 (+0000)
Subject: * elmo-dop.el (elmo-dop-queue-flush): Fixed obsolete version message.
X-Git-Tag: wl-2_8-root~73
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de09334f0fb7b21d691cebc56a7a4ae88e58286d;p=elisp%2Fwanderlust.git

* elmo-dop.el (elmo-dop-queue-flush): Fixed obsolete version message.
(elmo-dop-queue-flush): Don't append to the dop-queue while flushing
queues (It causes infinite loop).
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 4861985..6e329de 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-11  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-dop.el (elmo-dop-queue-flush): Fixed obsolete version message.
+	(elmo-dop-queue-flush): Don't append to the dop-queue while flushing
+	queues (It causes infinite loop).
+
 2001-12-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* elmo.el (elmo-folder-diff): Fixed docstring for IMAP4
diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index f18b043..c53104b 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -88,10 +88,12 @@ even an operation concerns the unplugged folder."
     ;; obsolete
     (unless (or (null queue)
 		(vectorp (car queue)))
-      (when (y-or-n-p "Saved queue is old version(2.4). Clear all pending operations? ")
-	(setq elmo-dop-queue nil)
-	(message "All pending operations are cleared.")
-	(elmo-dop-queue-save)))
+      (if (y-or-n-p "Saved queue is old version(2.6). Clear all pending operations? ")
+	  (progn
+	    (setq elmo-dop-queue nil)
+	    (message "All pending operations are cleared.")
+	    (elmo-dop-queue-save))
+	(error "Please use 2.6 or earlier.")))
     (setq count (length queue))
     (when (> count 0)
       (if (elmo-y-or-n-p
@@ -117,7 +119,9 @@ even an operation concerns the unplugged folder."
 				 (setq folder
 				       (elmo-make-folder
 					(elmo-dop-queue-fname (car queue))))
-			       (elmo-folder-open folder))
+			       (elmo-folder-open folder)
+			       (unless (elmo-folder-plugged-p folder)
+				 (error "Unplugged.")))
 			     (elmo-dop-queue-arguments (car queue)))
 		      (elmo-folder-close folder))
 		  (quit  (setq failure t))