# HG changeset patch # User Richard M. Stallman # Date 785024499 0 # Node ID 23ad7670da3464e5096c1a5cd9b8d8ca9b45147f # Parent 0a50658ec6f9c1b4c2cc0875ce38ca799b3a3001 (timezone-parse-date): Handle two new formats (6 and 7). diff -r 0a50658ec6f9 -r 23ad7670da34 lisp/timezone.el --- a/lisp/timezone.el Wed Nov 16 21:44:15 1994 +0000 +++ b/lisp/timezone.el Wed Nov 16 22:21:39 1994 +0000 @@ -127,7 +127,9 @@ (2) Fri, 17 Mar 89 4:01[:33] [GMT] (3) Mon Jan 16 16:12[:37] [GMT] 1989 (4) 6 May 1992 1641-JST (Wednesday) - (5) 22-AUG-1993 10:59:12.82" + (5) 22-AUG-1993 10:59:12.82 + (6) Thu, 11 Apr 16:17:12 91 [MET] + (7) Mon, 6 Jul 16:47:20 T 1992 [MET]" (let ((date (or date "")) (year nil) (month nil) @@ -135,6 +137,14 @@ (time nil) (zone nil)) ;This may be nil. (cond ((string-match + "\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\'" date) + ;; Styles: (6) and (7) without timezone + (setq year 6 month 3 day 2 time 4 zone nil)) + ((string-match + "\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date) + ;; Styles: (6) and (7) with timezone and buggy timezone + (setq year 6 month 3 day 2 time 4 zone 7)) + ((string-match "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\'" date) ;; Styles: (1) and (2) without timezone (setq year 3 month 2 day 1 time 4 zone nil))