* elmo-maildir.el (elmo-map-folder-set-flag): Use cdr of

`elmo-maildir-flag-specs' element instead of one.
(elmo-map-folder-unset-flag): Ditto.
(Reported by Ken Makimura <macky@astem.or.jp>)

* elmo-imap4.el (elmo-folder-set-flag-plugged): Fixed.
(elmo-folder-unset-flag-plugged): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 05af736..d51831e 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-16  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-maildir.el (elmo-map-folder-set-flag): Use cdr of
+       `elmo-maildir-flag-specs' element instead of one.
+       (elmo-map-folder-unset-flag): Ditto.
+       (Reported by Ken Makimura <macky@astem.or.jp>)
+
+       * elmo-imap4.el (elmo-folder-set-flag-plugged): Fixed.
+       (elmo-folder-unset-flag-plugged): Ditto.
+
 2004-01-13  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-nntp.el (elmo-folder-list-flagged): Return a list according

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 60543c5..49848e9 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2347,13 +2347,13 @@ If optional argument REMOVE is non-nil, remove FLAG."
                                                  numbers flag)
   (let ((spec (cdr (assq flag elmo-imap4-flag-specs))))
     (when spec
-      (elmo-imap4-set-flag folder numbers (car spec) (cdr spec)))))
+      (elmo-imap4-set-flag folder numbers (car spec) (nth 1 spec)))))
 
 (luna-define-method elmo-folder-unset-flag-plugged ((folder elmo-imap4-folder)
                                                    numbers flag)
   (let ((spec (cdr (assq flag elmo-imap4-flag-specs))))
     (when spec
-      (elmo-imap4-set-flag folder numbers (car spec) (not (cdr spec))))))
+      (elmo-imap4-set-flag folder numbers (car spec) (not (nth 1 spec))))))
 
 (luna-define-method elmo-message-use-cache-p ((folder elmo-imap4-folder)
                                              number)

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 6e3d05b..7959e4e 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -314,14 +314,17 @@ LOCATION."
 
 (luna-define-method elmo-map-folder-set-flag ((folder elmo-maildir-folder)
                                              locations flag)
-  (let ((spec (assq flag elmo-maildir-flag-specs)))
-    (elmo-maildir-set-mark-messages folder locations (car spec) (cdr spec))))
+  (let ((spec (cdr (assq flag elmo-maildir-flag-specs))))
+    (when spec
+      (elmo-maildir-set-mark-messages folder locations
+                                     (car spec) (nth 1 spec)))))
 
 (luna-define-method elmo-map-folder-unset-flag ((folder elmo-maildir-folder)
                                                locations flag)
-  (let ((spec (assq flag elmo-maildir-flag-specs)))
-    (elmo-maildir-set-mark-messages folder locations
-                                   (car spec) (not (cdr spec)))))
+  (let ((spec (cdr (assq flag elmo-maildir-flag-specs))))
+    (when spec
+      (elmo-maildir-set-mark-messages folder locations
+                                     (car spec) (not (nth 1 spec))))))
 
 (luna-define-method elmo-folder-list-subfolders
   ((folder elmo-maildir-folder) &optional one-level)