(dired-move-to-filename-regexp): Prepend .* so that we find the

last match if there are multiple matches.

diff --git a/lisp/dired.el b/lisp/dired.el
index 41b08b4f2ecae4db34f3ea4ae0f2b1da71cdfee4..886a4945da6b5154f098c4b90df7712c2115e6fc 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1369,10 +1369,13 @@ DIR must be a directory name, not a file name."
         (western (concat "\\(" month s dd "\\|" dd s month "\\)"
                          s "\\(" HH:MM "\\|" s yyyy "\\|" yyyy s "\\)"))
         (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
-        ;; Require the previous column to end in a digit.
+        ;; 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
-    (concat "[0-9]" s "\\(" western "\\|" japanese "\\)" s))
+        ;; 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]" s "\\(" western "\\|" japanese "\\)" 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.")