* elmo.el (elmo-generic-folder-append-messages): Fixed last change.

* elmo-localdir.el (elmo-folder-append-messages): Set flag as
'read when mark is null.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index e445b78..d55b657 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo.el (elmo-generic-folder-append-messages): Fixed last change.
+
+       * elmo-localdir.el (elmo-folder-append-messages): Set flag as
+       'read when mark is null.
+
 2003-07-24  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-version.el (elmo-version): Up to 2.11.4.

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 4ed3d22..14f30d3 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -236,7 +236,7 @@
        (while numbers
          (setq mark (elmo-message-mark src-folder (car numbers))
                flag (cond
-                     ((null mark) nil)
+                     ((null mark) 'read)
                      ((member mark (elmo-msgdb-answered-marks))
                       'answered)
                      ;;

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 7392cdb..dd04160 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1020,25 +1020,24 @@ NUMBERS is a list of message numbers, messages are searched from the list."
 (defun elmo-generic-folder-append-messages (folder src-folder numbers
                                                   same-number)
   (let (unseen table flag mark
-              succeed-numbers failure cache)
+              succeed-numbers failure cache id)
     (setq table (elmo-flag-table-load (elmo-folder-msgdb-path folder)))
     (with-temp-buffer
       (set-buffer-multibyte nil)
       (while numbers
        (setq failure nil
+             id (elmo-message-field src-folder (car numbers) 'message-id)
              mark (elmo-message-mark src-folder (car numbers))
-             flag (cond
-                   ((null mark) nil)
-                   ((member mark (elmo-msgdb-answered-marks))
-                    'answered)
-                   ;;
-                   ((not (member mark (elmo-msgdb-unread-marks)))
-                    'read)))
+             flag (and id
+                       (cond
+                        ((null mark) 'read)
+                        ((member mark (elmo-msgdb-answered-marks))
+                         'answered)
+                        ;;
+                        ((not (member mark (elmo-msgdb-unread-marks)))
+                         'read))))
        (condition-case nil
-           (setq cache (elmo-file-cache-get
-                        (elmo-message-field src-folder
-                                            (car numbers)
-                                            'message-id))
+           (setq cache (elmo-file-cache-get id)
                  failure
                  (not
                   (and
@@ -1065,12 +1064,8 @@ NUMBERS is a list of message numbers, messages are searched from the list."
          (error (setq failure t)))
        ;; FETCH & APPEND finished
        (unless failure
-         (when flag
-           (elmo-flag-table-set table
-                                (elmo-message-field
-                                 src-folder (car numbers)
-                                 'message-id)
-                                flag))
+         (when id
+           (elmo-flag-table-set table id flag))
          (setq succeed-numbers (cons (car numbers) succeed-numbers)))
        (elmo-progress-notify 'elmo-folder-move-messages)
        (setq numbers (cdr numbers)))