X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-archive.el;h=4db7c42e4be81249770615e3b833fbf9a66a07d8;hb=64eb91d7fe775e78e0f1e6555b595e40f391260a;hp=7a888be8d91ed784ae95a657c03b7cce30022d83;hpb=f288b03364529690137d0cc64e6b7feec4b99001;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 7a888be..4db7c42 100644
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -447,7 +447,7 @@ TYPE specifies the archiver's symbol."
 	     (delete-file dummy)))
        ))))
 
-(luna-define-method elmo-folder-delete ((folder elmo-archive-folder))
+(luna-define-method elmo-folder-delete :before ((folder elmo-archive-folder))
   (let ((arc (elmo-archive-get-archive-name folder)))
     (if (not (file-exists-p arc))
 	(error "No such file: %s" arc)
@@ -551,11 +551,12 @@ TYPE specifies the archiver's symbol."
 	 (method (elmo-archive-get-method type 'cat))
 	 (args (list arc (elmo-concat-path
 			  prefix (int-to-string number)))))
-    (when (file-exists-p arc)
-      (and
-       (as-binary-process
-	(elmo-archive-call-method method args t))
-       (elmo-delete-cr-buffer)))))
+    (and (file-exists-p arc)
+	 (as-binary-process
+	  (elmo-archive-call-method method args t))
+	 (progn
+	   (elmo-delete-cr-buffer)
+	   t))))
 
 (luna-define-method elmo-message-fetch-internal ((folder elmo-archive-folder)
 						 number strategy
@@ -606,8 +607,7 @@ TYPE specifies the archiver's symbol."
 	     nil))))))
 
 (luna-define-method elmo-folder-append-messages :around
-  ((folder elmo-archive-folder) src-folder numbers unread-marks
-   &optional same-number)
+  ((folder elmo-archive-folder) src-folder numbers &optional same-number)
   (let ((prefix (elmo-archive-folder-archive-prefix-internal folder)))
     (cond
      ((and same-number
@@ -900,9 +900,7 @@ TYPE specifies the archiver's symbol."
       (elmo-archive-msgdb-create-entity-subr number))))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-archive-folder)
-					      numbers new-mark
-					      already-mark seen-mark
-					      important-mark seen-list)
+					      numbers seen-list)
   (when numbers
     (save-excursion ;; 981005
       (if (and elmo-archive-use-izip-agent
@@ -910,17 +908,11 @@ TYPE specifies the archiver's symbol."
 		(elmo-archive-folder-archive-type-internal folder)
 		'cat-headers))
 	  (elmo-archive-msgdb-create-as-numlist-subr2
-	   folder numbers new-mark already-mark seen-mark important-mark
-	   seen-list)
+	   folder numbers seen-list)
 	(elmo-archive-msgdb-create-as-numlist-subr1
-	 folder numbers new-mark already-mark seen-mark important-mark
-	 seen-list)))))
+	 folder numbers seen-list)))))
 
-(defun elmo-archive-msgdb-create-as-numlist-subr1 (folder
-						   numlist new-mark
-						   already-mark seen-mark
-						   important-mark
-						   seen-list)
+(defun elmo-archive-msgdb-create-as-numlist-subr1 (folder numlist seen-list)
   (let* ((type (elmo-archive-folder-archive-type-internal folder))
 	 (file (elmo-archive-get-archive-name folder))
 	 (method (elmo-archive-get-method type 'cat))
@@ -953,10 +945,10 @@ TYPE specifies the archiver's symbol."
 			     (elmo-file-cache-get message-id))
 			    (if seen
 				nil
-			      already-mark)
+			      elmo-msgdb-unread-cached-mark)
 			  (if seen
-			      seen-mark
-			    new-mark))))
+			      elmo-msgdb-read-uncached-mark
+			    elmo-msgdb-new-mark))))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
@@ -974,9 +966,7 @@ TYPE specifies the archiver's symbol."
 
 ;;; info-zip agent
 (defun elmo-archive-msgdb-create-as-numlist-subr2 (folder
-						   numlist new-mark
-						   already-mark seen-mark
-						   important-mark
+						   numlist
 						   seen-list)
   (let* ((delim1 elmo-mmdf-delimiter)		;; MMDF
 	 (delim2 elmo-unixmail-delimiter)	;; UNIX Mail
@@ -1010,10 +1000,7 @@ TYPE specifies the archiver's symbol."
 	(goto-char (point-min))
 	(cond
 	 ((looking-at delim1)	;; MMDF
-	  (setq result (elmo-archive-parse-mmdf msgs
-						new-mark
-						already-mark seen-mark
-						seen-list))
+	  (setq result (elmo-archive-parse-mmdf msgs seen-list))
 	  (setq overview (append overview (nth 0 result)))
 	  (setq number-alist (append number-alist (nth 1 result)))
 	  (setq mark-alist (append mark-alist (nth 2 result))))
@@ -1032,10 +1019,7 @@ TYPE specifies the archiver's symbol."
 	   percent))))
     (list overview number-alist mark-alist)))
 
-(defun elmo-archive-parse-mmdf (msgs new-mark
-				     already-mark
-				     seen-mark
-				     seen-list)
+(defun elmo-archive-parse-mmdf (msgs seen-list)
   (let ((delim elmo-mmdf-delimiter)
 	number sp ep rest entity overview number-alist mark-alist ret-val
 	message-id seen gmark)
@@ -1068,16 +1052,17 @@ TYPE specifies the archiver's symbol."
 			     (elmo-file-cache-get message-id))
 			    (if seen
 				nil
-			      already-mark)
+			      elmo-msgdb-unread-cached-mark)
 			  (if seen
-			      seen-mark
-			    new-mark))))
+			      elmo-msgdb-read-uncached-mark
+			    elmo-msgdb-new-mark))))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
 		     (elmo-msgdb-overview-entity-get-number entity)
 		     gmark)))
-	  (setq ret-val (append ret-val (list overview number-alist mark-alist)))
+	  (setq ret-val (append ret-val (list overview number-alist
+					      mark-alist)))
 	  (widen)))
       (forward-line 1)
       (setq rest (cdr rest)))