(mh-folder-list): Fix problem with passing in a folder and getting

nothing back. Fix problem with passing in empty string and getting the
entire filesystem (or infinite loop). Don't append slash to folder.
These fixes fix problems observed with the pick search. Thanks to
Thomas Baumann for the help (closes SF #1435381).

2 files changed, 27 insertions, 17 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 84d9c0ada57..36a02532455 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -4,6 +4,11 @@
         mh-image-directory.
         (mh-image-load-path): Access mh-image-directory instead of
         mh-image-load-path.
+        (mh-folder-list): Fix problem with passing in a folder and getting
+        nothing back. Fix problem with passing in empty string and getting
+        the entire filesystem (or infinite loop). Don't append slash to
+        folder. These fixes fix problems observed with the pick search.
+        Thanks to Thomas Baumann for the help (closes SF #1435381).
 
 2006-02-27  Bill Wohler  <wohler@newt.com>
 
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index f09763ba9f5..ebd342b6786 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -526,14 +526,19 @@ number of sub-folders. XXX"
 ;;;###mh-autoload
 (defun mh-folder-list (folder)
   "Return FOLDER and its descendents.
-Returns a list of strings. For example,
-
-  '(\"inbox\" \"lists\" \"lists/mh-e\").
-
-If folder is nil, then all folders are considered. Respects the
-value of `mh-recursive-folders-flag'. If this flag is nil, and
-the sub-folders have not been explicitly viewed, then they will
-not be returned."
+FOLDER may have a + prefix. Returns a list of strings without the
++ prefix. If FOLDER is nil, then all folders are considered. For
+example, if your Mail directory only contains the folders +inbox,
++outbox, +lists, and +lists/mh-e, then
+
+  (mh-folder-list nil)
+       => (\"inbox\" \"lists\" \"lists/mh-e\" \"outbox\")
+  (mh-folder-list \"+lists\")
+       => (\"lists/mh-e\")
+
+Respects the value of `mh-recursive-folders-flag'. If this flag
+is nil, and the sub-folders have not been explicitly viewed, then
+they will not be returned."
   (let ((folder-list))
     ;; Normalize folder. Strip leading +. Add trailing slash (done in
     ;; two steps to avoid infinite loops when replacing "/*$" with "/"
@@ -542,16 +547,16 @@ not be returned."
     ;; returns all the files in / if given an empty string or +.
     (when folder
       (setq folder (mh-replace-regexp-in-string "^\+" "" folder))
-      (setq folder (mh-replace-regexp-in-string "/+$" "" folder))
-      (setq folder (concat folder "/"))
-      (if (equal folder "")
-        (setq folder nil)))
+      (setq folder (mh-replace-regexp-in-string "/+$" "" folder)))
+    ;; Add provided folder to list, unless all folders are asked for.
+    (unless (null folder)
+      (setq folder-list (list folder)))
     (loop for f in (mh-sub-folders folder) do
-          (setq folder-list (append folder-list (list (concat folder (car f)))))
-          (if (mh-children-p f)
-              (setq folder-list
-                    (append folder-list
-                            (mh-folder-list (concat folder (car f)))))))
+          (setq folder-list
+                (append folder-list
+                        (if (mh-children-p f)
+                            (mh-folder-list (concat folder "/" (car f)))
+                          (list (concat folder "/" (car f)))))))
     folder-list))
 
 ;;;###mh-autoload