X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-dop.el;h=fda2f92a649eeca193daba4b857591496dbdab36;hb=a5bcb1f0eb41b558a6b4ed277047adc6b8676a2a;hp=8a53a0c5f99d091cc557d585560667789534aa1d;hpb=a7a0b5c319681155c65368786f12e4c6ac71e2dc;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 8a53a0c..fda2f92 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,23 @@ 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-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))))
@@ -131,8 +134,8 @@ even an operation concerns the unplugged folder."
 				       (elmo-make-folder
 					(elmo-dop-queue-fname (car queue))))
 			       (elmo-folder-open folder)
-			       (unless (elmo-folder-plugged-p folder); redundant?
-				 (error "Unplugged.")))
+			       (unless (elmo-folder-plugged-p folder)
+				 (error "Unplugged")))
 			     (elmo-dop-queue-arguments (car queue)))
 		      (elmo-folder-close folder))
 		  (quit  (setq failure t))
@@ -166,7 +169,7 @@ even an operation concerns the unplugged folder."
 	   (memq (elmo-dop-queue-method que)
 		 elmo-dop-queue-merge-method-list)
 	   (setq match-queue
-		 (car (delete 
+		 (car (delete
 		       nil
 		       (mapcar
 			(lambda (nqueue)
@@ -231,10 +234,10 @@ FOLDER is the folder structure."
 				 (car (elmo-dop-queue-arguments queue)))))))))
 
 ;;; DOP operations.
-(defsubst elmo-folder-append-buffer-dop (folder unread &optional number)
+(defsubst elmo-folder-append-buffer-dop (folder &optional flag number)
   (elmo-dop-queue-append
    folder 'elmo-folder-append-buffer-dop-delayed
-   (list unread
+   (list flag
 	 (elmo-dop-spool-folder-append-buffer
 	  folder)
 	 number)))
@@ -275,6 +278,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
@@ -284,15 +293,15 @@ FOLDER is the folder structure."
 	 spool-length
 	 (i 0)
 	 max-num)
-    (setq spool-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))
     (cons (+ max-num spool-length) (+ (length number-list) spool-length))))
 
 ;;; Delayed operation (executed at online status).
-(defun elmo-folder-append-buffer-dop-delayed (folder unread number set-number)
+(defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number)
   (let ((spool-folder (elmo-dop-spool-folder folder))
 	failure saved dequeued)
     (with-temp-buffer
@@ -302,14 +311,17 @@ FOLDER is the folder structure."
 	  (condition-case nil
 	      (setq failure (not
 			     (elmo-folder-append-buffer
-			      folder unread set-number)))
+			      folder
+			      (if (eq flag t) nil flag) ; for compatibility
+			      set-number)))
 	    (error (setq failure t)))
 	(setq dequeued t)) ; Already deletef from queue.
       (when failure
 	;; Append failed...
 	(setq saved (elmo-folder-append-buffer
 		     (elmo-make-folder elmo-lost+found-folder)
-		     unread set-number)))
+		     (if (eq flag t) nil flag) ; for compatibility
+		     set-number)))
       (if (and (not dequeued)    ; if dequeued, no need to delete.
 	       (or (not failure) ; succeed
 		   saved))       ; in lost+found