* elmo-maildir.el (elmo-folder-message-make-temp-files): Respect

start-number correctly.
* elmo-search.el (elmo-folder-message-make-temp-files): Ditto.
* elmo-file.el (elmo-folder-message-make-temp-files): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 2fd5cb4..b8349a4 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-20  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * elmo-maildir.el (elmo-folder-message-make-temp-files): Respect
+       start-number correctly.
+       * elmo-search.el (elmo-folder-message-make-temp-files): Ditto.
+       * elmo-file.el (elmo-folder-message-make-temp-files): Ditto.
+
 2006-08-12  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-flag.el (elmo-flag-folder-set-minfo): New function.

diff --git a/elmo/elmo-file.el b/elmo/elmo-file.el
index 169d55e..dbf8b0b 100644 (file)
--- a/elmo/elmo-file.el
+++ b/elmo/elmo-file.el
@@ -184,13 +184,14 @@
                                                         &optional
                                                         start-number)
   (let ((temp-dir (elmo-folder-make-temporary-directory folder))
-       (cur-number (if start-number 0)))
+       (cur-number (or start-number 0)))
     (dolist (number numbers)
       (elmo-copy-file
        (elmo-message-file-name folder number)
        (expand-file-name
-       (int-to-string (if start-number (incf cur-number) number))
-       temp-dir)))
+       (int-to-string (if start-number cur-number number))
+       temp-dir))
+      (incf cur-number))
     temp-dir))
 
 (luna-define-method elmo-map-message-fetch ((folder elmo-file-folder)

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 8fa8e32..9d0b42f 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -478,13 +478,14 @@ file name for maildir directories."
                                                         &optional
                                                         start-number)
   (let ((temp-dir (elmo-folder-make-temporary-directory folder))
-       (cur-number (if start-number 0)))
+       (cur-number (or start-number 0)))
     (dolist (number numbers)
       (elmo-copy-file
        (elmo-message-file-name folder number)
        (expand-file-name
-       (int-to-string (if start-number (incf cur-number) number))
-       temp-dir)))
+       (int-to-string (if start-number cur-number number))
+       temp-dir))
+      (incf cur-number))
     temp-dir))
 
 (luna-define-method elmo-folder-append-messages :around

diff --git a/elmo/elmo-search.el b/elmo/elmo-search.el
index 5091831..514d875 100644 (file)
--- a/elmo/elmo-search.el
+++ b/elmo/elmo-search.el
@@ -173,13 +173,14 @@ Returns non-nil if fetching was succeed.")
                                                         &optional
                                                         start-number)
   (let ((temp-dir (elmo-folder-make-temporary-directory folder))
-       (cur-number 0))
+       (cur-number (or start-number 0)))
     (dolist (number numbers)
       (elmo-copy-file
        (elmo-message-file-name folder number)
        (expand-file-name
-       (number-to-string (if start-number (incf cur-number) number))
-       temp-dir)))
+       (number-to-string (if start-number cur-number number))
+       temp-dir))
+      (incf cur-number))
     temp-dir))
 
 (luna-define-method elmo-map-message-fetch ((folder elmo-search-folder)