Synch up with main trunk.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index d8109c2..e826149 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,35 @@
+2001-02-13  OKAZAKI Tetsurou  <refactor@acidrain.localnet>
+
+       * elmo-imap4.el (elmo-imap4-prefetch-msg): Set `msgdb'
+       argument of `elmo-imap4-read-msg' as nil.
+
+2001-02-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo2.el (elmo-prefetch-msg): Set `unread' argument of
+       `elmo-read-msg' as 'unread.
+       (elmo-read-msg-with-cache): Set `msgdb' argument as nil.
+
+       * elmo-archive.el (elmo-archive-read-msg): Fixed arguments.
+       * elmo-cache.el (elmo-cache-read-msg): Ditto.
+       * elmo-filter.el (elmo-filter-read-msg): Ditto.
+       * elmo-imap4.el (elmo-imap4-read-msg): Ditto.
+       * elmo-internal.el (elmo-internal-read-msg): Ditto.
+       * elmo-localdir.el (elmo-localdir-read-msg): Ditto.
+       * elmo-localnews.el (elmo-localnews-read-msg): Ditto.
+       * elmo-maildir.el (elmo-maildir-read-msg): Ditto.
+       * elmo-multi.el (elmo-multi-read-msg): Ditto.
+       * elmo-nntp.el (elmo-nntp-read-msg): Ditto.
+       * elmo-pipe.el (elmo-pipe-read-msg): Ditto.
+       * elmo-pop3.el (elmo-pop3-read-msg): Ditto.
+
+2001-02-09  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo2.el (elmo-buffer-cache-message): Call `elmo-read-msg' with
+       argument `unread' as non-nil.
+       (elmo-read-msg-with-cache): Added argument `unread'.
+       (elmo-read-msg-no-cache): Ditto.
+       (elmo-read-msg): Ditto.
+
 2001-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-pipe.el (elmo-pipe-drain): Bind `elmo-inhibit-read-cache' as t

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 478eabb..dce24bc 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -460,7 +460,7 @@ TYPE specifies the archiver's symbol."
 ;;; Article file related functions
 ;;; read(extract) / append(move) / delete(delete) / query(list)
 
-(defun elmo-archive-read-msg (spec number outbuf)
+(defun elmo-archive-read-msg (spec number outbuf &optional msgdb unread)
   (save-excursion
     (let* ((type (nth 2 spec))
           (arc (elmo-archive-get-archive-name (nth 1 spec) type spec))

diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el
index e6ec563..fba1de5 100644 (file)
--- a/elmo/elmo-cache.el
+++ b/elmo/elmo-cache.el
@@ -642,7 +642,7 @@ Returning its cache buffer."
     ;; return nil if failed.
     (elmo-cache-force-delete file locked)))
 
-(defun elmo-cache-read-msg (spec number outbuf &optional set-mark)
+(defun elmo-cache-read-msg (spec number outbuf &optional msgdb unread)
   (save-excursion
     (let* ((dir (elmo-cache-get-folder-directory spec))
           (file (expand-file-name

diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 854a1f9..54c24d5 100644 (file)
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -59,8 +59,8 @@
 (defun elmo-filter-append-msg (spec string &optional msg no-see)
   (elmo-call-func (nth 2 spec) "append" string))
 
-(defun elmo-filter-read-msg (spec number outbuf)
-  (elmo-call-func (nth 2 spec) "read-msg" number outbuf))
+(defun elmo-filter-read-msg (spec number outbuf &optional msgdb unread)
+  (elmo-call-func (nth 2 spec) "read-msg" number outbuf msgdb unread))
 
 (defun elmo-filter-delete-msgs (spec msgs)
   (elmo-call-func (nth 2 spec) "delete-msgs" msgs))

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 04c98ff..cc6ab2a 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1356,10 +1356,10 @@ If optional argument UNMARK is non-nil, unmark."
        'fetch)))))
 
 (defun elmo-imap4-prefetch-msg (spec msg outbuf)
-  (elmo-imap4-read-msg spec msg outbuf 'unseen))
+  (elmo-imap4-read-msg spec msg outbuf nil 'unseen))
 
 (defun elmo-imap4-read-msg (spec msg outbuf
-                                &optional leave-seen-flag-untouched)
+                                &optional msgdb leave-seen-flag-untouched)
   (let ((session (elmo-imap4-get-session spec))
        response)
     (elmo-imap4-session-select-mailbox session

diff --git a/elmo/elmo-internal.el b/elmo/elmo-internal.el
index 461287c..312291d 100644 (file)
--- a/elmo/elmo-internal.el
+++ b/elmo/elmo-internal.el
@@ -193,7 +193,7 @@
   (let ((pair (assq number loc-alist)))
     (elmo-msgdb-global-mark-delete (cdr pair))))
 
-(defun elmo-internal-read-msg (spec number outbuf &optional msgdb)
+(defun elmo-internal-read-msg (spec number outbuf &optional msgdb unread)
   (save-excursion
     (let* ((loc-alist (if msgdb (elmo-msgdb-get-location msgdb)
                        (elmo-msgdb-location-load (elmo-msgdb-expand-path

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 02a8b1f..4174042 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -272,7 +272,7 @@
        (progn (delete-file file)
               t))))
 
-(defun elmo-localdir-read-msg (spec number outbuf &optional set-mark)
+(defun elmo-localdir-read-msg (spec number outbuf &optional msgdb unread)
   (save-excursion
     (let* ((number (int-to-string number))
           (dir (elmo-localdir-get-folder-directory spec))

diff --git a/elmo/elmo-localnews.el b/elmo/elmo-localnews.el
index 6b72e1f..9287ec4 100644 (file)
--- a/elmo/elmo-localnews.el
+++ b/elmo/elmo-localnews.el
@@ -60,7 +60,7 @@
   (elmo-localnews-as-newsdir
    (elmo-localdir-delete-msgs dir number)))
 
-(defun elmo-localnews-read-msg (spec number outbuf)
+(defun elmo-localnews-read-msg (spec number outbuf &optional msgdb unread)
   (elmo-localnews-as-newsdir
    (elmo-localdir-read-msg spec number outbuf)))
 

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 6c83f5d..63ba79e 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -329,7 +329,7 @@ file name for maildir directories."
        (progn (delete-file file)
               t))))
 
-(defun elmo-maildir-read-msg (spec number outbuf &optional msgdb)
+(defun elmo-maildir-read-msg (spec number outbuf &optional msgdb unread)
   (save-excursion
     (let* ((loc-alist (if msgdb (elmo-msgdb-get-location msgdb)
                        (elmo-msgdb-location-load (elmo-msgdb-expand-path

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 6a7a3a6..6204c6c 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -144,11 +144,11 @@
 (defun elmo-multi-append-msg (spec string)
   (error "Cannot append messages to multi folder"))
 
-(defun elmo-multi-read-msg (spec number outbuf)
+(defun elmo-multi-read-msg (spec number outbuf &optional msgdb unread)
   (let* ((flds (cdr spec))
         (folder (nth (- (/ number elmo-multi-divide-number) 1) flds))
         (number (% number elmo-multi-divide-number)))
-    (elmo-call-func folder "read-msg" number outbuf)))
+    (elmo-call-func folder "read-msg" number outbuf msgdb unread)))
 
 (defun elmo-multi-delete-msgs (spec msgs)
   (let ((flds (cdr spec))

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 1fc88a0..c79d908 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -860,7 +860,7 @@ Don't cache if nil.")
       (with-current-buffer (elmo-network-session-buffer session)
        (std11-field-body "Newsgroups")))))
 
-(defun elmo-nntp-read-msg (spec number outbuf)
+(defun elmo-nntp-read-msg (spec number outbuf &optional msgdb unread)
   (let ((session (elmo-nntp-get-session spec)))
     (with-current-buffer (elmo-network-session-buffer session)
       (elmo-nntp-select-group session (elmo-nntp-spec-group spec))

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 633f952..352c0ed 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -46,10 +46,10 @@
 (defun elmo-pipe-append-msg (spec string &optional msg no-see)
   (elmo-append-msg (elmo-pipe-spec-dst spec) string))
 
-(defun elmo-pipe-read-msg (spec number outbuf)
+(defun elmo-pipe-read-msg (spec number outbuf &optional msgdb unread)
   (elmo-call-func (elmo-pipe-spec-dst spec)
                  "read-msg"
-                 number outbuf))
+                 number outbuf msgdb unread))
 
 (defun elmo-pipe-delete-msgs (spec msgs)
   (elmo-delete-msgs (elmo-pipe-spec-dst spec) msgs))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 13ac92b..473fbd7 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -685,7 +685,7 @@
        (insert-buffer-substring (process-buffer process) start (- end 3))
        (elmo-delete-cr-get-content-type)))))
 
-(defun elmo-pop3-read-msg (spec number outbuf &optional msgdb)
+(defun elmo-pop3-read-msg (spec number outbuf &optional msgdb unread)
   (let* ((loc-alist (if elmo-pop3-use-uidl
                        (if msgdb
                            (elmo-msgdb-get-location msgdb)

diff --git a/elmo/elmo2.el b/elmo/elmo2.el
index e96b6bc..85dd154 100644 (file)
--- a/elmo/elmo2.el
+++ b/elmo/elmo2.el
@@ -134,10 +134,11 @@
           (elmo-msgdb-rename-path old-folder new-folder))
        (elmo-dop-rename-folder old-folder new-folder)))))
 
-(defun elmo-read-msg-no-cache (folder msg outbuf)
+(defun elmo-read-msg-no-cache (folder msg outbuf &optional unread)
   "Read messsage specified by FOLDER and MSG(number) into OUTBUF
-without cacheing."
-  (elmo-call-func folder "read-msg" msg outbuf))
+without cacheing.
+If optional UNREAD is non-nil, message is keeped as unread."
+  (elmo-call-func folder "read-msg" msg outbuf nil unread))
 
 (defun elmo-force-cache-msg (folder number msgid &optional loc-alist)
   "Force cache message."
@@ -180,7 +181,9 @@ without cacheing."
              ((elmo-folder-local-p (car real-fld-num)))
              (t (setq ret-val (elmo-call-func (car real-fld-num)
                                               "read-msg"
-                                              (cdr real-fld-num) outbuf))))
+                                              (cdr real-fld-num)
+                                              outbuf
+                                              nil 'unread))))
        (if ret-val
            (elmo-cache-save message-id
                             (elmo-string-partial-p ret-val)
@@ -205,18 +208,18 @@ without cacheing."
 
 ;;  elmo-read-msg (folder msg outbuf msgdb)
 ;;; read message
-(defun elmo-read-msg (folder msg outbuf msgdb &optional force-reload)
+(defun elmo-read-msg (folder msg outbuf msgdb &optional force-reload unread)
   "Read message into outbuf."
   (let ((inhibit-read-only t))
     (if elmo-inhibit-read-cache
     ;;Only use elmo-read-msg-with-cache, because if folder is network and
     ;;elmo-use-cache-p is nil, cannot read important msg. (by muse)
     ;;(if (not (elmo-use-cache-p folder msg))
-       (elmo-read-msg-no-cache folder msg outbuf)
-      (elmo-read-msg-with-cache folder msg outbuf msgdb force-reload))))
+       (elmo-read-msg-no-cache folder msg outbuf unread)
+      (elmo-read-msg-with-cache folder msg outbuf msgdb force-reload unread))))
 
 (defun elmo-read-msg-with-cache (folder msg outbuf msgdb
-                                       &optional force-reload)
+                                       &optional force-reload unread)
   "Read message into outbuf with cacheing."
   (let* ((number-alist (elmo-msgdb-get-number-alist
                        (or msgdb (elmo-msgdb-load folder))))
@@ -236,7 +239,8 @@ without cacheing."
                          folder msg))
       (if (setq ret-val (elmo-call-func (car real-fld-num)
                                        "read-msg"
-                                       (cdr real-fld-num) outbuf))
+                                       (cdr real-fld-num) outbuf
+                                       nil unread))
          (if (and message-id
                   (not (elmo-local-file-p folder msg))
                   (elmo-use-cache-p folder msg))
@@ -730,7 +734,7 @@ message list in msgdb. Otherwise, number-list is load from msgdb."
       (setq mark-alist (cdr mark-alist)))
     (nreverse ret-val)))
 
-(defun elmo-buffer-cache-message (fld msg &optional msgdb force-reload)
+(defun elmo-buffer-cache-message (fld msg &optional msgdb force-reload unread)
   (let* ((msg-id (cdr (assq msg (elmo-msgdb-get-number-alist msgdb))))
         (hit (elmo-buffer-cache-hit (list fld msg msg-id)))
         (read nil))
@@ -745,7 +749,8 @@ message list in msgdb. Otherwise, number-list is load from msgdb."
              (set-buffer hit)
              (elmo-read-msg fld msg
                             (current-buffer)
-                            msgdb force-reload))
+                            msgdb force-reload
+                            unread))
          (quit
           (elmo-buffer-cache-delete)
           (error "read message %s/%s is quitted" fld msg))

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0d802c3..a18812d 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-02-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-cache-prefetch-message): Fixed last change.
+
+2001-02-14  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-cache-prefetch-message):
+       Call `elmo-buffer-cache-message' with `unread' argument.
+
 2001-02-07  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-draft.el (wl-draft-parse-msg-id-list-string): Fix.

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 0b83b9f..5cbc561 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -6018,7 +6018,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
                                                              folder next)))))
                  (if wl-cache-prefetch-debug
                      (message "Reading %d..." msg))
-                 (elmo-buffer-cache-message folder next msgdb)
+                 (elmo-buffer-cache-message folder next msgdb nil 'unread)
                  (if wl-cache-prefetch-debug
                      (message "Reading %d... done" msg))))))))))