* elmo-imap4.el (elmo-folder-list-subfolders): Fix handling of

hierarchical folder structure with UW-imapd.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 42f4cf1..7c26b10 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-15  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * elmo-imap4.el (elmo-folder-list-subfolders): Fix handling of
+       hierarchical folder structure with UW-imapd.
+
 2007-02-12  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo-imap4.el (elmo-imap4-clear-login): Don't send LOGIN command

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 11804c8..49dad35 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2034,13 +2034,13 @@ Return nil if no complete line has arrived."
                           root)))
            (setq root (concat root delim)))
          (while (setq folder (car result))
-           (when (string-match
-                  (concat "^\\(" (regexp-quote root) "[^" re-delim "]" "+\\)"
-                          re-delim)
-                  folder)
-             (setq folder (match-string 1 folder)))
-           (setq has-child-p nil
-                 result (delq
+           (setq has-child-p
+                 (when (string-match
+                        (concat "^\\(" (regexp-quote root) "[^" re-delim "]" "+\\)"
+                                re-delim)
+                        folder)
+                   (setq folder (match-string 1 folder))))
+           (setq result (delq
                          nil
                          (mapcar (lambda (fld)
                                    (if (string-match