X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=elmo%2Felmo-multi.el;h=c95d4ab7a933473274166c8120c6b6530cfd7b1f;hb=824fe18b2ad090f609041a4af11de484bdb7e3a8;hp=4d5b9a6621fc1772c76f34cbf23a88f1b0404bcc;hpb=a6d5a5adb70f71665568e1189525fc4eb98b088d;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 4d5b9a6..c95d4ab 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -45,12 +45,12 @@
 
 (defmacro elmo-multi-real-folder-number (folder number)
   "Returns a cons cell of real FOLDER and NUMBER."
-  (` (cons (nth (-
-		 (/ (, number)
-		    (elmo-multi-folder-divide-number-internal (, folder)))
-		 1) (elmo-multi-folder-children-internal (, folder)))
-	   (% (, number) (elmo-multi-folder-divide-number-internal
-			  (, folder))))))
+  `(cons (nth (-
+	       (/ ,number
+		  (elmo-multi-folder-divide-number-internal ,folder))
+	       1) (elmo-multi-folder-children-internal ,folder))
+	 (% ,number (elmo-multi-folder-divide-number-internal
+		     ,folder))))
 
 (luna-define-method elmo-folder-initialize ((folder
 					     elmo-multi-folder)
@@ -88,11 +88,10 @@
    (elmo-define-signal-filter (folder sender)
      (memq sender (elmo-multi-folder-children-internal folder))))
   (elmo-connect-signal
-   nil 'cache-changed folder
-   (elmo-define-signal-handler (folder child number)
-     (elmo-emit-signal
-      'cache-changed folder
-      (car (elmo-multi-map-numbers folder child (list number)))))
+   nil 'status-changed folder
+   (elmo-define-signal-handler (folder child numbers)
+     (elmo-emit-signal 'status-changed folder
+		       (elmo-multi-map-numbers folder child numbers)))
    (elmo-define-signal-filter (folder sender)
      (memq sender (elmo-multi-folder-children-internal folder))))
   (elmo-connect-signal
@@ -137,6 +136,10 @@
   (dolist (fld (elmo-multi-folder-children-internal folder))
     (elmo-folder-close fld)))
 
+(luna-define-method elmo-message-killed-p ((folder elmo-multi-folder) number)
+  (let ((pair (elmo-multi-real-folder-number folder number)))
+    (elmo-message-killed-p (car pair) (cdr pair))))
+
 (luna-define-method elmo-folder-synchronize ((folder elmo-multi-folder)
 					     &optional
 					     disable-killed
@@ -521,6 +524,35 @@
 	  (setq flag-alist (cons pair flag-alist)))))
     flag-alist))
 
+(luna-define-method elmo-folder-recover-messages ((folder elmo-multi-folder)
+						  numbers)
+  (dolist (element (elmo-multi-split-numbers folder numbers))
+    (when (cdr element)
+      (elmo-folder-recover-messages (car element) (cdr element)))))
+
+(defun elmo-folder-append-messages-multi-* (dst-folder
+					    src-folder
+					    numbers
+					    same-number)
+  (if same-number
+      (elmo-folder-append-messages dst-folder src-folder numbers same-number
+				   'elmo-folder-append-messages-multi-*)
+    (let ((divider (elmo-multi-folder-divide-number-internal src-folder))
+	  (cur-number 0)
+	  succeeds)
+      (dolist (element (elmo-multi-split-numbers src-folder numbers))
+	(setq cur-number (+ cur-number 1))
+	(when (cdr element)
+	  (setq succeeds
+		(nconc
+		 succeeds
+		 (mapcar
+		  (lambda (x)
+		    (+ (* divider cur-number) x))
+		  (elmo-folder-append-messages
+		   dst-folder (car element) (cdr element)))))))
+      succeeds)))
+
 (require 'product)
 (product-provide (provide 'elmo-multi) (require 'elmo-version))