(dired-move-to-filename-regexp):

Do not distinguish between ASCII letters and non-ASCII characters.
Don't allow comma except in the form "month day, year".
Don't allow space between month name and comma.
Clean up the code that checks for trailing period, comma, and space.
Remove now-obsolete comments, and add more commentary about
Japanese dates.
Always gobble up trailing spaces, instead of doing it only sometimes.

1 files changed, 16 insertions, 23 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index 5361bdd22bf..21aa49a866f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1505,36 +1505,28 @@ DIR must be a directory name, not a file name."
 (defvar dired-move-to-filename-regexp
   (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
          ;; In some locales, month abbreviations are as short as 2 letters,
-         ;; and they can be padded on the right with spaces.
-         ;; weiand: changed: month ends potentially with . or , or .,
-;;old    (month (concat l l "+ *"))
-         (month (concat l l "+[.]?,? *"))
-         ;; Recognize any non-ASCII character.
-         ;; The purpose is to match a Kanji character.
-         (k "[^\0-\177]")
-         ;; (k "[^\x00-\x7f\x80-\xff]")
+         ;; and they can be followed by ".".
+         (month (concat l l "+\\.?"))
          (s " ")
          (yyyy "[0-9][0-9][0-9][0-9]")
-         (mm "[ 0-1]?[0-9]")
-;;old    (dd "[ 0-3][0-9]")
-         (dd "[ 0-3][0-9][.]?")
+         (dd "[ 0-3][0-9]")
          (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
          (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
          (zone "[-+][0-2][0-9][0-5][0-9]")
          (iso-mm-dd "[01][0-9]-[0-3][0-9]")
          (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
          (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
-                      "\\|" yyyy "-" iso-mm-dd " ?\\)"))
-         (western (concat "\\(" month s dd "\\|" dd s month "\\)"
-         ;; weiand: changed: year potentially unaligned
-;;old                     s "\\(" HH:MM "\\|" s yyyy "\\|" yyyy s "\\)"))
-                          s "\\(" HH:MM
-                                  "\\|" yyyy s s "?"
-                                  "\\|" s "?" yyyy
-                             "\\)"))
+                      "\\|" yyyy "-" iso-mm-dd "\\)"))
+         (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
+                          s "+"
+                          "\\(" HH:MM "\\|" yyyy "\\)"))
+         (western-comma (concat month s "+" dd "," s "+" yyyy))
+         ;; Japanese MS-Windows ls-lisp has one-digit months, and
+         ;; omits the Kanji characters after month and day-of-month.
+         (mm "[ 0-1]?[0-9]")
          (japanese
-          (concat mm k "?" s dd k "?" s "+"
-                  "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
+          (concat mm l "?" s dd l "?" s "+"
+                  "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
          ;; The "[0-9]" below requires the previous column to end in a digit.
          ;; This avoids recognizing `1 may 1997' as a date in the line:
          ;; -r--r--r--   1 may      1997        1168 Oct 19 16:49 README
@@ -1542,8 +1534,9 @@ DIR must be a directory name, not a file name."
          ;; The ".*" below finds the last match if there are multiple matches.
          ;; This avoids recognizing `jservice  10  1024' as a date in the line:
          ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-    (concat ".*[0-9][kMGTPEZY]?" 
-            s "\\(" western "\\|" japanese "\\|" iso "\\)" s))
+    (concat ".*[0-9][kMGTPEZY]?" s
+            "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
+            s "+"))
   "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.")