[Emacs-commit] emacs/lisp/mh-e mh-utils.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/02/09 19:53:44

Modified files:
        lisp/mh-e      : mh-utils.el ChangeLog 

Log message:
        (mh-folder-list): Don't replace "/*$" with "/" since that causes an
        infinite loop on XEmacs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-utils.el.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.147&tr2=1.148&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.147 emacs/lisp/mh-e/ChangeLog:1.148
--- emacs/lisp/mh-e/ChangeLog:1.147     Thu Feb  9 19:06:33 2006
+++ emacs/lisp/mh-e/ChangeLog   Thu Feb  9 19:53:44 2006
@@ -1,5 +1,8 @@
 2006-02-09  Bill Wohler  <address@hidden>
 
+       * 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.
 
Index: emacs/lisp/mh-e/mh-utils.el
diff -u emacs/lisp/mh-e/mh-utils.el:1.48 emacs/lisp/mh-e/mh-utils.el:1.49
--- emacs/lisp/mh-e/mh-utils.el:1.48    Fri Feb  3 23:02:51 2006
+++ emacs/lisp/mh-e/mh-utils.el Thu Feb  9 19:53:44 2006
@@ -516,13 +516,15 @@
 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