* wl-draft.el (wl-draft-do-fcc): Follow the API change.

* elmo-dop.el (elmo-folder-append-buffer-dop-delayed): Follow the
API change.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 287e034..e4bd3e0 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-dop.el (elmo-folder-append-buffer-dop-delayed): Follow the
+       API change.
+
 2003-09-15  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * modb.el: New file.

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index dd3b089..4d543ca 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -299,6 +299,13 @@ FOLDER is the folder structure."
 ;;; Delayed operation (executed at online status).
 (defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number)
   (let ((spool-folder (elmo-dop-spool-folder folder))
+       (flags (cond ((listp flag)
+                     flag)
+                    ;; for compatibility
+                    ((eq flag t)
+                     nil)
+                    (t
+                     (list flag))))
        failure saved dequeued)
     (with-temp-buffer
       (if (elmo-message-fetch spool-folder number
@@ -308,7 +315,7 @@ FOLDER is the folder structure."
              (setq failure (not
                             (elmo-folder-append-buffer
                              folder
-                             (if (eq flag t) nil flag) ; for compatibility
+                             flags
                              set-number)))
            (error (setq failure t)))
        (setq dequeued t)) ; Already deletef from queue.
@@ -316,7 +323,7 @@ FOLDER is the folder structure."
        ;; Append failed...
        (setq saved (elmo-folder-append-buffer
                     (elmo-make-folder elmo-lost+found-folder)
-                    (if (eq flag t) nil flag) ; for compatibility
+                    flags
                     set-number)))
       (if (and (not dequeued)    ; if dequeued, no need to delete.
               (or (not failure) ; succeed

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7b19602..77ff903 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-17  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-draft.el (wl-draft-do-fcc): Follow the API change.
+
 2003-09-15  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * Version number is increased to 2.11.13.

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 5e2f5d7..16d0a3a 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1570,7 +1570,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
          (if (elmo-folder-append-buffer
               (wl-folder-get-elmo-folder
                (eword-decode-string (car fcc-list)))
-              (and wl-fcc-force-as-read 'read))
+              (and wl-fcc-force-as-read '(read)))
              (wl-draft-write-sendlog 'ok 'fcc nil (car fcc-list) id)
            (wl-draft-write-sendlog 'failed 'fcc nil (car fcc-list) id))
          (if (and wl-draft-fcc-append-read-folder-hist