(elmo-message-folder): Call `elmo-message-folder' recursively.

(elmo-folder-diff): Avoid error `wrong-type-argument number-or-marker-p nil'
when a destination folder is a filter folder.

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 33f0f64..3229ac3 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -176,8 +176,8 @@
         ((consp (cdr dst-diff)) ; new unread all
          (mapcar (lambda (number) (+ number src-length)) dst-diff))
         (t
-         (cons (+ (car dst-diff) src-length)
-               (+ (cdr dst-diff) src-length))))
+         (cons (+ (or (car dst-diff) 0) src-length)
+               (+ (or (cdr dst-diff) 0) src-length))))
       ;; No save.
       (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder))
       (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))))
@@ -362,7 +362,7 @@
 
 (luna-define-method elmo-message-folder ((folder elmo-pipe-folder)
                                         number)
-  (elmo-pipe-folder-dst-internal folder))
+  (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number))
 
 (require 'product)
 (product-provide (provide 'elmo-pipe) (require 'elmo-version))