From: teranisi <teranisi>
Date: Tue, 7 Oct 2003 04:42:32 +0000 (+0000)
Subject: * elmo-imap4.el (elmo-imap4-session-select-mailbox): Use value of `flags' if
X-Git-Tag: wl-2_11_19~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=22f1357f5a11a36e08357c91a93eef37acfd7498;p=elisp%2Fwanderlust.git

* elmo-imap4.el (elmo-imap4-session-select-mailbox): Use value of `flags' if
`permanentflags' does not exist.
(elmo-folder-open): Ditto.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b3713ad..3f574a6 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -6,6 +6,9 @@
 	(elmo-imap4-set-flag): Treat \Deleted flag as an exception.
 	(elmo-imap4-disuse-server-flag-mailbox-regexp): Abolish.
 	(elmo-folder-use-flag-p): Always return t.
+	(elmo-imap4-session-select-mailbox): Use value of `flags' if
+	`permanentflags' does not exist.
+	(elmo-folder-open): Ditto.
 
 2003-10-06  Yuuichi Teranishi  <teranisi@gohome.org>
 
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 08c2f38..88144ee 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -692,7 +692,8 @@ Returns response value if selecting folder succeed. "
 	       (nth 1 (assq 'read-only (assq 'ok response))))
 	      (elmo-imap4-session-set-flags-internal
 	       session
-	       (nth 1 (assq 'permanentflags response))))
+	       (nth 1 (or (assq 'permanentflags response)
+			  (assq 'flags response)))))
 	  (elmo-imap4-session-set-current-mailbox-internal session nil)
 	  (if (and (eq no-error 'notify-bye)
 		   (elmo-imap4-response-bye-p response))
@@ -2462,7 +2463,8 @@ If optional argument REMOVE is non-nil, remove FLAG."
 		     (nth 1 (assq 'read-only (assq 'ok response))))
 		    (elmo-imap4-session-set-flags-internal
 		     session
-		     (nth 1 (assq 'permanentflags response))))
+		     (nth 1 (or (assq 'permanentflags response)
+				(assq 'flags response)))))
 		(elmo-imap4-session-set-current-mailbox-internal session nil)
 		(if (elmo-imap4-response-bye-p response)
 		    (elmo-imap4-process-bye session)