* elmo.el (elmo-message-flags): Use `elmo-msgdb-flags' instead of

`elmo-msgdb-mark'.

* elmo-util.el (elmo-with-progress-display): Fixed edebug spec.

* elmo-pipe.el (elmo-message-flags): Defined.

* elmo-multi.el (elmo-message-flags): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 2531315..8e0cb09 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-10  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo.el (elmo-message-flags): Use `elmo-msgdb-flags' instead of
+       `elmo-msgdb-mark'.
+
+       * elmo-util.el (elmo-with-progress-display): Fixed edebug spec.
+
+       * elmo-pipe.el (elmo-message-flags): Defined.
+
+       * elmo-multi.el (elmo-message-flags): Ditto.
+
 2003-09-07  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-msgdb.el (elmo-msgdb-delete-messages): Renamed from

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index 78c5d84..d554abf 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -189,6 +189,10 @@
   (let ((pair (elmo-multi-real-folder-number folder number)))
     (elmo-message-mark (car pair) (cdr pair))))
 
+(luna-define-method elmo-message-flags ((folder elmo-multi-folder) number)
+  (let ((pair (elmo-multi-real-folder-number folder number)))
+    (elmo-message-flags (car pair) (cdr pair))))
+
 (defun elmo-multi-split-numbers (folder numlist &optional as-is)
   (let ((numbers (sort numlist '<))
        (divider (elmo-multi-folder-divide-number-internal folder))

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 8b645c8..63aabf7 100644 (file)
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -372,6 +372,9 @@
 (luna-define-method elmo-message-mark ((folder elmo-pipe-folder) number)
   (elmo-message-mark (elmo-pipe-folder-dst-internal folder) number))
 
+(luna-define-method elmo-message-flags ((folder elmo-pipe-folder) number)
+  (elmo-message-flags (elmo-pipe-folder-dst-internal folder) number))
+
 (luna-define-method elmo-message-field ((folder elmo-pipe-folder)
                                        number field)
   (elmo-message-field (elmo-pipe-folder-dst-internal folder)

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 0f3a5b2..0e3ab3e 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1224,7 +1224,7 @@ If optional DELETE-FUNCTION is speficied, it is used as delete procedure."
 
 (put 'elmo-with-progress-display 'lisp-indent-function '2)
 (def-edebug-spec elmo-with-progress-display
-  (form (symbolp form &rest form) &rest form))
+  (form (symbolp form &optional form) &rest form))
 
 (defmacro elmo-with-progress-display (condition spec &rest body)
   "Evaluate BODY with progress gauge if CONDITION is non-nil.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index b1fb544..1b75434 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1232,17 +1232,7 @@ FOLDER is a ELMO folder structure.
 NUMBER is a number of the message.")
 
 (luna-define-method elmo-message-flags ((folder elmo-folder) number)
-  ;; This is a provisional implement.
-  (let ((mark (elmo-message-mark folder number)))
-    (append
-     (and (string= mark elmo-msgdb-new-mark)
-         '(new))
-     (and (string= mark elmo-msgdb-important-mark)
-         '(important))
-     (and (member mark (elmo-msgdb-unread-marks))
-         '(unread))
-     (and (member mark (elmo-msgdb-answered-marks))
-         '(answered)))))
+  (elmo-msgdb-flags (elmo-folder-msgdb folder) number))
 
 (defsubst elmo-message-flagged-p (folder number flag)
   "Return non-nil if the message is set FLAG.