* wl.el (wl-plugged-dop-queue-info): Use elmo-dop-queue-method-name

instead of elmo-dop-queue-method.

* elmo.el (elmo-generic-folder-append-messages): Make
fetch-strategy with `use-cache'.

* elmo-dop.el (elmo-dop-queue-method-name-alist): New variable.
(elmo-dop-queue-method-name): New macro.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 69db0f9..4b11171 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo.el (elmo-generic-folder-append-messages): Make 
+       fetch-strategy with `use-cache'.
+
+       * elmo-dop.el (elmo-dop-queue-method-name-alist): New variable.
+       (elmo-dop-queue-method-name): New macro.
+
 2001-08-03  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-archive.el (elmo-archive-get-archive-name): Fixed

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 3d68913..413252f 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -62,6 +62,20 @@ Automatically loaded/saved.")
                                    method arguments)))
     (setq elmo-dop-queue (nconc elmo-dop-queue (list queue)))))
 
+(defvar elmo-dop-queue-method-name-alist
+  '((elmo-folder-append-buffer-dop-delayed . "Append")
+    (elmo-folder-delete-messages-dop-delayed . "Delete")
+    (elmo-message-encache-dop . "Encache")
+    (elmo-create-folder-dop . "Create")
+    (elmo-folder-mark-as-read-dop . "Read")
+    (elmo-folder-unmark-read-dop . "Unread")
+    (elmo-folder-mark-as-important-dop . "Important")
+    (elmo-folder-unmark-important-dop . "Unimportant")))
+
+(defmacro elmo-dop-queue-method-name (queue)
+  `(cdr (assq (elmo-dop-queue-method ,queue)
+             elmo-dop-queue-method-name-alist)))
+
 (defun elmo-dop-queue-flush (&optional force)
   "Flush disconnected operations.
 If optional argument FORCE is non-nil, try flushing all operation queues

diff --git a/elmo/elmo.el b/elmo/elmo.el
index cebcd65..2543d9d 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -867,7 +867,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-MARK-ALIST).")
                        (eq (elmo-file-cache-status cache) 'entire))
                   (elmo-make-fetch-strategy
                    'entire t nil (elmo-file-cache-path cache))
-                (elmo-make-fetch-strategy 'entire))
+                (elmo-make-fetch-strategy 'entire t))
               nil (current-buffer)
               'unread)
              (unless (eq (buffer-size) 0)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 69dcc87..10cdaf2 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl.el (wl-plugged-dop-queue-info): Use elmo-dop-queue-method-name
+       instead of elmo-dop-queue-method.
+
 2001-08-06  SAITO Atsunori <sai@yedo.com>
 
        * wl-vars.el (wl-ldap-objectclass): New user option.

diff --git a/wl/wl.el b/wl/wl.el
index 5b6cb9d..872ed32 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -281,10 +281,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
       (setq last (elmo-dop-queue-fname (car dop-queue)))) ;; first
     (while dop-queue
       (when (car dop-queue)
-       (setq ope (cons (elmo-dop-queue-method (car dop-queue))
-                       (length 
+       (setq ope (cons (elmo-dop-queue-method-name (car dop-queue))
+                       (length
                         (if (listp
-                             (car 
+                             (car
                               (elmo-dop-queue-arguments (car dop-queue))))
                             (car (elmo-dop-queue-arguments
                                   (car dop-queue))))))))