Merge from emacs--rel--22

[gnu-emacs] / lisp / files.el

diff --git a/lisp/files.el b/lisp/files.el
index 3950d5e7195e29b84eff48afb0a511e2dc21431e..908bc95356b55f6f278068bb4f9c86721a9f7c42 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -226,12 +226,12 @@ have fast storage with limited space, such as a RAM disk."
   (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names)))
         (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
                 "[+, ;=|<>\"?*]\\|\\[\\|\\]\\|"  ; invalid characters
-                "[\000-\031]\\|"                 ; control characters
+                "[\000-\037]\\|"                 ; control characters
                 "\\(/\\.\\.?[^/]\\)\\|"          ; leading dots
                 "\\(/[^/.]+\\.[^/.]*\\.\\)"))    ; more than a single dot
        ((memq system-type '(ms-dos windows-nt cygwin))
         (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
-                "[|<>\"?*\000-\031]"))           ; invalid characters
+                "[|<>\"?*\000-\037]"))           ; invalid characters
        (t "[\000]"))
   "Regexp recognizing file names which aren't allowed by the filesystem.")