Commit da01a066 authored by Bill Wohler's avatar Bill Wohler

(mh-folder-list): Don't replace "/*$" with "/" since that causes an

infinite loop on XEmacs.
parent fcfc4732
2006-02-09 Bill Wohler <wohler@newt.com>
* mh-utils.el (mh-folder-list): Don't replace "/*$" with "/" since
that causes an infinite loop on XEmacs.
* mh-compat.el(mh-replace-regexp-in-string): Add missing regexp
argument.
......
......@@ -516,13 +516,15 @@ 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. If no
;; folder is specified, ensure it is nil to ensure we get the
;; top-level folders; otherwise mh-sub-folders returns all the
;; files in / if given an empty string or +.
;; Normalize folder. Strip leading +. Add trailing slash (done in
;; two steps to avoid infinite loops when replacing "/*$" with "/"
;; in XEmacs). If no folder is specified, ensure it is nil to
;; ensure we get the top-level folders; otherwise mh-sub-folders
;; 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 (mh-replace-regexp-in-string "/+$" "" folder))
(setq folder (concat folder "/"))
(if (equal folder "")
(setq folder nil)))
(loop for f in (mh-sub-folders folder) do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment