From: teranisi <teranisi>
Date: Tue, 19 Nov 2002 02:46:36 +0000 (+0000)
Subject: * elmo-imap4.el (elmo-folder-list-subfolders): Check the return value
X-Git-Tag: wl-2_11_1~33
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7442b97c8719377fbcb384627b49a19b56fa67;p=elisp%2Fwanderlust.git

* elmo-imap4.el (elmo-folder-list-subfolders): Check the return value
of elmo-string-matched-assoc to use match-data.
(Thanks to Mito <mito@mxa.nes.nec.co.jp>)
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 15c62d4..6ae9ba5 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-imap4.el (elmo-folder-list-subfolders): Check the return value
+	of elmo-string-matched-assoc to use match-data.
+	(Thanks to Mito <mito@mxa.nes.nec.co.jp>)
+
 2002-11-17  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* elmo-split.el (elmo-split->): New function.
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 438cc37..f189e0b 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1859,15 +1859,15 @@ Return nil if no complete line has arrived."
   (let* ((root (elmo-imap4-folder-mailbox-internal folder))
 	 (session (elmo-imap4-get-session folder))
 	 (prefix (elmo-folder-prefix-internal folder))
-	 (delim (or
-		 (cdr
+	 (namespace-assoc
 		  (elmo-string-matched-assoc
 		   root
 		   (with-current-buffer (elmo-network-session-buffer session)
 		     elmo-imap4-server-namespace)))
+	 (delim (or (cdr namespace-assoc)
 		 elmo-imap4-default-hierarchy-delimiter))
 	 ;; Append delimiter when root with namespace.
-	 (root (if (and (match-end 1)
+	 (root (if (and namespace-assoc
 			(string= (substring root (match-end 1))
 				 ""))
 		   (concat root delim)