Changed codename to Venus-pre2.

[elisp/wanderlust.git] / elmo / elmo-dop.el

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index e3a6d95..e64c203 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -66,9 +66,7 @@ Automatically loaded/saved.")
   '(elmo-folder-mark-as-read
     elmo-folder-unmark-read
     elmo-folder-mark-as-important
-    elmo-folder-unmark-important
-    elmo-folder-mark-as-answered
-    elmo-folder-unmark-answered))
+    elmo-folder-unmark-important))
 
 (defvar elmo-dop-queue-method-name-alist
   '((elmo-folder-append-buffer-dop-delayed . "Append")
@@ -77,8 +75,6 @@ Automatically loaded/saved.")
     (elmo-folder-create-dop-delayed . "Create")
     (elmo-folder-mark-as-read . "Read")
     (elmo-folder-unmark-read . "Unread")
-    (elmo-folder-mark-as-answered . "Answered")
-    (elmo-folder-unmark-answered . "Unanswered")    
     (elmo-folder-mark-as-important . "Important")
     (elmo-folder-unmark-important . "Unimportant")))
 
@@ -88,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))))
@@ -275,12 +272,6 @@ FOLDER is the folder structure."
 (defsubst elmo-folder-unmark-important-dop (folder numbers)
   (elmo-dop-queue-append folder 'elmo-folder-unmark-important (list numbers)))
 
-(defsubst elmo-folder-mark-as-answered-dop (folder numbers)
-  (elmo-dop-queue-append folder 'elmo-folder-mark-as-answered (list numbers)))
-
-(defsubst elmo-folder-unmark-answered-dop (folder numbers)
-  (elmo-dop-queue-append folder 'elmo-folder-unmark-answered (list numbers)))
-
 ;;; Execute as subsutitute for plugged operation.
 (defun elmo-folder-status-dop (folder)
   (let* ((number-alist (elmo-msgdb-number-load
@@ -290,8 +281,10 @@ FOLDER is the folder structure."
         spool-length
         (i 0)
         max-num)
-    (setq spool-length (or (car (if (elmo-folder-exists-p spool-folder)
-                                   (elmo-folder-status spool-folder))) 0))
+    (setq spool-length
+         (or (car (if (elmo-folder-exists-p spool-folder)
+                      (elmo-folder-status spool-folder)))
+             0))
     (setq max-num
          (or (nth (max (- (length number-list) 1) 0) number-list)
              0))