From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 31 Aug 2005 08:33:25 +0000 (+0000)
Subject: (dired-move-to-filename-regexp): Add date format for Mac OS X 10.3 in
X-Git-Tag: emacs-pretest-22.0.90~7340
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=064801fe9456d00511b14f8b60c0f0d50a3cccd5;p=emacs.git

(dired-move-to-filename-regexp): Add date format for Mac OS X 10.3 in
East Asian locales.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index 508bc39bbb5..e06e808e1ae 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1860,9 +1860,12 @@ DIR must be a directory name, not a file name."
 	 (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.
+	 ;; On Mac OS X 10.3, the date format in East Asian locales is
+	 ;; day-of-month digits followed by month digits.
 	 (mm "[ 0-1]?[0-9]")
-	 (japanese
-	  (concat mm l "?" s dd l "?" s "+"
+	 (east-asian
+	  (concat "\\(" mm l "?" s dd l "?" s "+"
+		  "\\|" dd s mm 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:
@@ -1872,7 +1875,7 @@ DIR must be a directory name, not a file name."
 	 ;; 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][BkKMGTPEZY]?" s
-	    "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
+	    "\\(" western "\\|" western-comma "\\|" east-asian "\\|" 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