(dired-move-to-filename-regexp): Allow one digit in the

numeric month value, and allow the Kanji character after the it to
be missing (happens with ls-lisp's output on Japanese versions of
MS-Windows).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f64fd59f13d64d53e1f6d4bf342afec96e6bdf4..5cb7a4669d4e03bd02bfabea774f1fe1666db90a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * dired.el (dired-move-to-filename-regexp): Allow one digit in the
+       numeric month value, and allow the Kanji character after the it to
+       be missing (happens with ls-lisp's output on Japanese versions of
+       MS-Windows).
+
 2001-09-18  Miles Bader  <miles@gnu.org>
 
        * diff-mode.el (diff-mode): Don't make the buffer read-only if

diff --git a/lisp/dired.el b/lisp/dired.el
index fa9ce16f74a9aaa505d03f6f011fb30d2ca4d53d..7465eebb4c51be6cc35ded1f24fa4c8738124b40 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1515,7 +1515,7 @@ DIR must be a directory name, not a file name."
         ;; (k "[^\x00-\x7f\x80-\xff]")
         (s " ")
         (yyyy "[0-9][0-9][0-9][0-9]")
-        (mm "[ 0-1][0-9]")
+        (mm "[ 0-1]?[0-9]")
 ;;old   (dd "[ 0-3][0-9]")
         (dd "[ 0-3][0-9][.]?")
         (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
@@ -1533,7 +1533,8 @@ DIR must be a directory name, not a file name."
                                  "\\|" s "?" yyyy
                             "\\)"))
         (japanese
-         (concat mm k s dd k "?" s "+" "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
+         (concat mm k "?" s dd k "?" s "+"
+                 "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
         ;; 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