* wl.el (wl-plugged-dop-queue-info): Fix to check stream-type.

(wl-plugged-drawing): Ditto.

* elmo.el (elmo-generic-folder-append-messages): Find cache file in
unplugged status when elmo-enable-disconnected-operation is t.

* elmo-dop.el (elmo-dop-spool-folder-append-buffer): Check existence
of spool folder before checking new number.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index da4f0ab..25deb45 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-generic-folder-append-messages): Find cache file in
+       unplugged status when elmo-enable-disconnected-operation is t.
+
+       * elmo-dop.el (elmo-dop-spool-folder-append-buffer): Check existence
+       of spool folder before checking new number.
+
 2001-06-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-pop3.el (elmo-network-close-session): Removed 3rd argument.

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 66b1aa5..3d68913 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -144,9 +144,9 @@ which is corresponded to the FOLDER."
 FOLDER is the folder structure.
 Return a message number."
   (setq folder (elmo-dop-spool-folder folder))
+  (unless (elmo-folder-exists-p folder)
+    (elmo-folder-create folder))
   (let ((new-number (1+ (car (elmo-folder-status folder)))))
-    (unless (elmo-folder-exists-p folder)
-      (elmo-folder-create folder))
     ;; dop folder is a localdir folder.
     (write-region-as-binary (point-min) (point-max)
                          (expand-file-name

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 0ceebdd..d490740 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -841,17 +841,28 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
 
 (defun elmo-generic-folder-append-messages (folder src-folder numbers
                                                   unread-marks same-number)
-  (let (unseen seen-list succeed-numbers failure)
+  (let (unseen seen-list succeed-numbers failure cache)
     (with-temp-buffer
       (while numbers
        (setq failure nil)
        (condition-case nil
            (progn
-             (elmo-message-fetch src-folder (car numbers)
-                                 (elmo-make-fetch-strategy
-                                  'entire)
-                                 nil (current-buffer)
-                                 'unread)
+             (elmo-message-fetch
+              src-folder (car numbers)
+              (if (and (not (elmo-folder-plugged-p src-folder))
+                       elmo-enable-disconnected-operation)
+                  (if (and (setq cache (elmo-file-cache-get
+                                        (elmo-message-field
+                                         src-folder (car numbers)
+                                         'message-id)))
+                           (eq (elmo-file-cache-status cache) 'entire))
+                      (elmo-make-fetch-strategy
+                       'entire
+                       t
+                       nil (elmo-file-cache-path cache)))
+                (elmo-make-fetch-strategy 'entire))
+              nil (current-buffer)
+              'unread)
              (unless (eq (buffer-size) 0)
                (elmo-folder-append-buffer
                 folder

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5028bb4..4741628 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl.el (wl-plugged-dop-queue-info): Fix to check stream-type.
+       (wl-plugged-drawing): Ditto.
+
 2001-06-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-util.el (wl-biff-check-folder): Use own buffer for pop3 biff

diff --git a/wl/wl.el b/wl/wl.el
index f672bfa..d1e20d9 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -296,7 +296,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
                                           (wl-folder-get-elmo-folder last))))
          (setq alist
                (wl-append-assoc-list
-                (cons (car server-info) (nth 1 server-info)) ;; server port
+                server-info
                 (cons last operation)
                 alist)))
        (when (car dop-queue)
@@ -329,7 +329,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   (let ((buffer-read-only nil)
        (alist plugged-alist)
        (vars wl-plugged-switch-variables)
-       last server port label plugged time
+       last server port stream-type label plugged time
        line len qinfo column)
     (erase-buffer)
     (while vars
@@ -351,6 +351,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (while alist
       (setq server (nth 0 (caar alist))
            port (nth 1 (caar alist))
+           stream-type (nth 2 (caar alist))
            label (nth 1 (car alist))
            plugged (nth 2 (car alist))
            time (nth 3 (car alist)))
@@ -386,7 +387,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
               (wl-set-string-width column line)
               (wl-plugged-sending-queue-status qinfo))))
        ;; dop queue status
-       ((setq qinfo (assoc (cons server port) wl-plugged-dop-queue-alist))
+       ((setq qinfo (assoc (list server port stream-type)
+                          wl-plugged-dop-queue-alist))
        (setq line
              (concat
               (wl-set-string-width column line)