Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1081

3 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb3a907d6c3..4489d7e247f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-25  Jason Rumney  <jasonr@gnu.org>
+
+        * files.el (file-name-invalid-regexp): Fix octal/decimal confusion.
+
 2008-02-25  Juri Linkov  <juri@jurta.org>
 
         * isearch.el (isearch-fail): Use "RosyBrown1" for a light
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index e7666973521..82814f2226d 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -2595,7 +2595,7 @@
         * bookmark.el (bookmark-buffer-file-name): Abbreviate the bookmark
         path.  Rewrite function in `cond' style for readability.
 
-        Suggested by: Stephen Eglen <S.J.Eglen{_AT_}damtp.cam.ac.uk>.
+        Suggested by Stephen Eglen <S.J.Eglen{_AT_}damtp.cam.ac.uk>.
         (The path shortening, that is, not the rearrangement.)
 
 2007-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
diff --git a/lisp/files.el b/lisp/files.el
index 3950d5e7195..908bc95356b 100644
--- 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.")