diff options
| author | Jason Rumney | 2008-02-24 16:57:51 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-02-24 16:57:51 +0000 |
| commit | 12f68d3fdf486789ceb06466de4c4d158da244e9 (patch) | |
| tree | 587d181ea5ed199b751e7cfcb6b3815eb4cb5f87 | |
| parent | 20ca5ee4f7d897d79416a6fdd084db1eabb392b0 (diff) | |
| download | emacs-12f68d3fdf486789ceb06466de4c4d158da244e9.tar.gz emacs-12f68d3fdf486789ceb06466de4c4d158da244e9.zip | |
(file-name-invalid-regexp): Fix octal/decimal confusion.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9293dc86619..58cc80df443 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-02-24 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * files.el (file-name-invalid-regexp): Fix octal/decimal confusion. | ||
| 4 | |||
| 1 | 2008-02-23 Ulrich Mueller <ulm@gentoo.org> (tiny change) | 5 | 2008-02-23 Ulrich Mueller <ulm@gentoo.org> (tiny change) |
| 2 | 6 | ||
| 3 | * textmodes/bibtex.el (bibtex-convert-alien): Fix sit-for ags. | 7 | * textmodes/bibtex.el (bibtex-convert-alien): Fix sit-for ags. |
diff --git a/lisp/files.el b/lisp/files.el index 7c0557cd5ad..cd375dfd00d 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -217,12 +217,12 @@ have fast storage with limited space, such as a RAM disk." | |||
| 217 | (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names))) | 217 | (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names))) |
| 218 | (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive | 218 | (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive |
| 219 | "[+, ;=|<>\"?*]\\|\\[\\|\\]\\|" ; invalid characters | 219 | "[+, ;=|<>\"?*]\\|\\[\\|\\]\\|" ; invalid characters |
| 220 | "[\000-\031]\\|" ; control characters | 220 | "[\000-\037]\\|" ; control characters |
| 221 | "\\(/\\.\\.?[^/]\\)\\|" ; leading dots | 221 | "\\(/\\.\\.?[^/]\\)\\|" ; leading dots |
| 222 | "\\(/[^/.]+\\.[^/.]*\\.\\)")) ; more than a single dot | 222 | "\\(/[^/.]+\\.[^/.]*\\.\\)")) ; more than a single dot |
| 223 | ((memq system-type '(ms-dos windows-nt cygwin)) | 223 | ((memq system-type '(ms-dos windows-nt cygwin)) |
| 224 | (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive | 224 | (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive |
| 225 | "[|<>\"?*\000-\031]")) ; invalid characters | 225 | "[|<>\"?*\000-\037]")) ; invalid characters |
| 226 | (t "[\000]")) | 226 | (t "[\000]")) |
| 227 | "Regexp recognizing file names which aren't allowed by the filesystem.") | 227 | "Regexp recognizing file names which aren't allowed by the filesystem.") |
| 228 | 228 | ||