From ce2bf1c158b49c0bd9cb43bca25265a45ed3efb6 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Sun, 20 Jan 2002 14:51:03 +0000
Subject: [PATCH] * elmo-imap4.el (elmo-imap4-extra-namespace-alist): Added
 grouping for namespace part.
 (elmo-imap4-parse-namespace-subr): Ditto.
 (elmo-folder-list-subfolders): Append a delimiter when the
 specified folder path is a root with namespace and does not
 end with delimiter.

---
 elmo/ChangeLog     |    8 ++++++++
 elmo/elmo-imap4.el |   16 ++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 94478c3..7c55cbf 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-imap4.el (elmo-imap4-extra-namespace-alist): Added grouping
+	for namespace part.
+	(elmo-imap4-parse-namespace-subr): Ditto.
+	(elmo-folder-list-subfolders): Append a delimiter when the specified
+	folder path is a root with namespace and does not end with delimiter.
+
 2002-01-20  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* elmo.el (elmo-folder-search-fast): Moved upwards rather than it
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 355b111..97af1ca 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -91,8 +91,10 @@
   "Use cache in imap4 folder.")
 
 (defvar elmo-imap4-extra-namespace-alist
-  '(("^{.*/nntp}.*$" . ".")) ; Default is for UW's remote nntp mailbox...
-  "Extra namespace alist.  A list of cons cell like: (REGEXP . DELIMITER).")
+  '(("^\\({.*/nntp}\\).*$" . ".")) ; Default is for UW's remote nntp mailbox...
+  "Extra namespace alist. 
+A list of cons cell like: (REGEXP . DELIMITER).
+REGEXP should have a grouping for namespace prefix.")
 ;;
 ;;; internal variables
 ;;
@@ -1580,11 +1582,11 @@ Return nil if no complete line has arrived."
 			    (if (eq (length prefix) 0)
 				(progn (setq default-delim delim) nil)
 			      (cons
-			       (concat "^"
+			       (concat "^\\("
 				       (if (string= (downcase prefix) "inbox")
 					   "[Ii][Nn][Bb][Oo][Xx]"
 					 (regexp-quote prefix))
-				       ".*$")
+				       "\\).*$")
 			       delim)))
 			  (elmo-imap4-nth i ns))))))
     (if default-delim
@@ -1890,6 +1892,12 @@ Return nil if no complete line has arrived."
 		   (with-current-buffer (elmo-network-session-buffer session)
 		     elmo-imap4-server-namespace)))
 		 elmo-imap4-default-hierarchy-delimiter))
+	 ;; Append delimiter when root with namespace.
+	 (root (if (and (match-end 1)
+			(string= (substring root (match-end 1))
+				 ""))
+		   (concat root delim)
+		 root))
 	 result append-serv type)
     (setq result (elmo-imap4-response-get-selectable-mailbox-list
 		  (elmo-imap4-send-command-wait
-- 
1.7.10.4