From f03a2d8caf816981cb78c8081101ee2795590bdb Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 19 Nov 2002 02:48:02 +0000 Subject: [PATCH] * elmo-imap4.el (elmo-folder-list-subfolders): Check the return value of elmo-string-matched-assoc to use match-data. (Thanks to Mito ) --- elmo/ChangeLog | 6 ++++++ elmo/elmo-imap4.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 9e2d267..a4fc939 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,9 @@ +2002-11-19 Yuuichi Teranishi + + * elmo-imap4.el (elmo-folder-list-subfolders): Check the return value + of elmo-string-matched-assoc to use match-data. + (Thanks to Mito ) + 2002-11-14 Yuuichi Teranishi * elmo-msgdb.el (elmo-msgdb-get-message-id-from-buffer): Added diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index 6853766..81553d8 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1872,15 +1872,16 @@ 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 + (match-end 1) (string= (substring root (match-end 1)) "")) (concat root delim) -- 1.7.10.4