diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-02-21 16:12:46 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-02-21 16:12:46 -0500 |
| commit | 50c58e2725507648d8d58ec6b2415e7f6d34862d (patch) | |
| tree | d762e301f3cbf26e390a7e5ce80c020f30b7879a | |
| parent | b660eb70f1e73146a769f81530ea262e90179d7b (diff) | |
| download | emacs-50c58e2725507648d8d58ec6b2415e7f6d34862d.tar.gz | |
* files.el (directory-listing-before-filename-regexp): Use
stricter matching for iso-style dates, to avoid false matches with
date-like filenames (Bug#5597).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40683a9c769..c33598f6e24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-02-21 Chong Yidong <cyd@stupidchicken.com> + * files.el (directory-listing-before-filename-regexp): Use + stricter matching for iso-style dates, to avoid false matches with + date-like filenames (Bug#5597). + * htmlfontify.el (htmlfontify): Doc fix. * eshell/eshell.el (eshell): Doc fix. diff --git a/lisp/files.el b/lisp/files.el index 41cddcd4f62..ee03c115cf8 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5592,8 +5592,10 @@ program specified by `directory-free-space-program' if that is non-nil." ;; -r--r--r-- 1 may 1997 1168 Oct 19 16:49 README ;; The "[BkKMGTPEZY]?" below supports "ls -alh" output. - ;; The ".*" below finds the last match if there are multiple matches. - ;; This avoids recognizing `jservice 10 1024' as a date in the line: + + ;; For non-iso date formats, we add the ".*" in order to find + ;; the last possible match. This avoids recognizing + ;; `jservice 10 1024' as a date in the line: ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host ;; vc dired listings provide the state or blanks between file @@ -5601,9 +5603,10 @@ program specified by `directory-free-space-program' if that is non-nil." ;; parantheses: ;; -rw-r--r-- (modified) 2005-10-22 21:25 files.el ;; This is not supported yet. - (purecopy (concat ".*[0-9][BkKMGTPEZY]?" s - "\\(" western "\\|" western-comma "\\|" east-asian "\\|" iso "\\)" - s "+"))) + (purecopy (concat "\\([0-9][BkKMGTPEZY]? " iso + "\\|.*[0-9][BkKMGTPEZY]? " + "\\(" western "\\|" western-comma "\\|" east-asian "\\)" + "\\) +"))) "Regular expression to match up to the file name in a directory listing. The default value is designed to recognize dates and times regardless of the language.") |