X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-dop.el;h=3ddb76f031fddef0f7fa2fedcc22f2446677816b;hb=64eb91d7fe775e78e0f1e6555b595e40f391260a;hp=5dcdf151575076c8784eb6fc64b505df9f56544a;hpb=5eab7554a5557dd814c53f50f8bed0401018878c;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 5dcdf15..3ddb76f 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -66,7 +66,9 @@ Automatically loaded/saved.")
   '(elmo-folder-mark-as-read
     elmo-folder-unmark-read
     elmo-folder-mark-as-important
-    elmo-folder-unmark-important))
+    elmo-folder-unmark-important
+    elmo-folder-mark-as-answered
+    elmo-folder-unmark-answered))
 
 (defvar elmo-dop-queue-method-name-alist
   '((elmo-folder-append-buffer-dop-delayed . "Append")
@@ -75,6 +77,8 @@ 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")))
 
@@ -82,24 +86,28 @@ Automatically loaded/saved.")
   `(cdr (assq (elmo-dop-queue-method ,queue)
 	      elmo-dop-queue-method-name-alist)))
 
-(defun elmo-dop-queue-flush (&optional force)
-  "Flush disconnected operations.
-If optional argument FORCE is non-nil, try flushing all operation queues
-even an operation concerns the unplugged folder."
+(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 elmo-dop-queue)
+  (let ((queue-all elmo-dop-queue)
+	queue
 	(count 0)
-	folder
 	len)
-    ;; obsolete
-    (unless (or (null queue)
-		(vectorp (car 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.")))
+    (while queue-all
+      (if (elmo-folder-plugged-p
+	   (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))
+	  (setq queue (append queue (list (car queue-all)))))
+      (setq queue-all (cdr queue-all)))
     (setq count (length queue))
     (when (> count 0)
       (if (elmo-y-or-n-p
@@ -125,9 +133,7 @@ even an operation concerns the unplugged folder."
 				 (setq folder
 				       (elmo-make-folder
 					(elmo-dop-queue-fname (car queue))))
-			       (elmo-folder-open folder)
-			       (unless (elmo-folder-plugged-p folder)
-				 (error "Unplugged.")))
+			       (elmo-folder-open folder))
 			     (elmo-dop-queue-arguments (car queue)))
 		      (elmo-folder-close folder))
 		  (quit  (setq failure t))
@@ -141,11 +147,14 @@ even an operation concerns the unplugged folder."
 		       performed num)
 	      (sit-for 0) ;
 	      (elmo-dop-queue-save)))
-	(if (elmo-y-or-n-p "Clear all pending operations? "
+	;; when answer=NO against performing dop
+	(if (elmo-y-or-n-p "Clear these pending operations? "
 			   (not elmo-dop-flush-confirm) t)
 	    (progn
-	      (setq elmo-dop-queue nil)
-	      (message "All pending operations are cleared.")
+	      (while queue
+		(setq elmo-dop-queue (delq (car queue) elmo-dop-queue))
+		(setq queue (cdr queue)))
+	      (message "Pending operations are cleared.")
 	      (elmo-dop-queue-save))
 	  (message "")))
       count)))
@@ -267,6 +276,12 @@ 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
@@ -276,8 +291,8 @@ FOLDER is the folder structure."
 	 spool-length
 	 (i 0)
 	 max-num)
-    (setq spool-length (length (car (if (elmo-folder-exists-p spool-folder)
-					(elmo-folder-status spool-folder)))))
+    (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))