From: hmurata <hmurata>
Date: Sun, 6 Oct 2002 14:28:56 +0000 (+0000)
Subject: * elmo-dop.el (elmo-dop-queue-flush): Check obsolete at first.
X-Git-Tag: wl-2_11_1~116
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20db99ca79a4348f0d4121cafb51510b9a710dea;p=elisp%2Fwanderlust.git

* elmo-dop.el (elmo-dop-queue-flush): Check obsolete at first.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6dc496f..c55f58d 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-dop.el (elmo-dop-queue-flush): Check obsolete at first.
+
 2002-09-24  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* elmo.el: Add autoload setting for elmo-nntp-post, fix against
diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index e08592a..35f8b65 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -84,20 +84,21 @@ Automatically loaded/saved.")
 
 (defun elmo-dop-queue-flush ()
   "Flush disconnected operations that consern plugged folders."
+  ;; obsolete
+  (unless (or (null elmo-dop-queue)
+	      (vectorp (car elmo-dop-queue)))
+    (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.")))
   (elmo-dop-queue-merge)
   (let ((queue-all elmo-dop-queue)
 	queue
 	(count 0)
 	len)
-    ;; obsolete
-    (unless (or (null queue-all)
-		(vectorp (car queue-all)))
-      (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.")))
     (while queue-all
       (if (elmo-folder-plugged-p
 	   (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))