(mh-index-new-folder): Use -2 suffix instead of <2> suffix for folder

names, as <> are illegal filename characters on Windows (closes SF
#1507002).

2 files changed, 15 insertions, 2 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index b9534ef9647..a679b5d65eb 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,9 +1,22 @@
+2006-06-15  Bill Wohler  <wohler@newt.com>
+
+        * mh-search.el (mh-index-new-folder): Use -2 suffix instead of <2>
+        suffix for folder names, as <> are illegal filenakme characters on
+        Windows (closes SF #1507002).
+        
 2006-06-05  Jacob Morzinski  <morzinski@MIT.EDU>  (tiny change)
 
         * mh-comp.el (mh-send-uses-spost): New variable.
         (mh-send-letter): Do not use -msgid and -mime if
         mh-send-uses-spost is t (closes SF #1486726).
 
+2006-06-02  Bill Wohler  <wohler@newt.com>
+        
+        (mh-folder-exists-p): Change test from an empty buffer, to one
+        that contains the actual folder, since GNU mailutils' folder
+        command displays output if the folder doesn't exist (closes SF
+        #1499712).
+
 2006-05-06  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.0.
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index b6f8dd71d9a..62c130bb90f 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1537,7 +1537,7 @@ If folder NAME already exists and was generated for the same
 SEARCH-REGEXP then it is reused.
 
 Otherwise if the folder NAME was generated from a different
-search then check if NAME<2> can be used. Otherwise try NAME<3>.
+search then check if NAME-2 can be used. Otherwise try NAME-3.
 This is repeated till we find a new folder name.
 
 If the folder returned doesn't exist then it is created."
@@ -1545,7 +1545,7 @@ If the folder returned doesn't exist then it is created."
     (error "The argument should be a valid MH folder name"))
   (let ((chosen-name
          (loop for i from 1
-               for candidate = (if (equal i 1) name (format "%s<%s>" name i))
+               for candidate = (if (equal i 1) name (format "%s-%s" name i))
                when (or (not (mh-folder-exists-p candidate))
                         (equal (mh-index-folder-search-regexp candidate)
                                search-regexp))