diff options
| author | Richard M. Stallman | 1997-05-03 05:22:46 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-05-03 05:22:46 +0000 |
| commit | bcabbf77d387f5bd7a93d961e274ba9b6ec511fa (patch) | |
| tree | 25a1636635a0095a6dbe4d27aed34acf070b1376 | |
| parent | 5e11a170e7b4250b642a3bf49decad7e05fbf0f2 (diff) | |
| download | emacs-bcabbf77d387f5bd7a93d961e274ba9b6ec511fa.tar.gz emacs-bcabbf77d387f5bd7a93d961e274ba9b6ec511fa.zip | |
(timezone-parse-date): Match forms 1 and 2 first.
| -rw-r--r-- | lisp/timezone.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/timezone.el b/lisp/timezone.el index 175cb182519..949a7f12dc2 100644 --- a/lisp/timezone.el +++ b/lisp/timezone.el | |||
| @@ -145,6 +145,16 @@ Understands the following styles: | |||
| 145 | (time nil) | 145 | (time nil) |
| 146 | (zone nil)) ;This may be nil. | 146 | (zone nil)) ;This may be nil. |
| 147 | (cond ((string-match | 147 | (cond ((string-match |
| 148 | "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date) | ||
| 149 | ;; Styles: (1) and (2) with timezone and buggy timezone | ||
| 150 | ;; This is most common in mail and news, | ||
| 151 | ;; so it is worth trying first. | ||
| 152 | (setq year 3 month 2 day 1 time 4 zone 5)) | ||
| 153 | ((string-match | ||
| 154 | "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\'" date) | ||
| 155 | ;; Styles: (1) and (2) without timezone | ||
| 156 | (setq year 3 month 2 day 1 time 4 zone nil)) | ||
| 157 | ((string-match | ||
| 148 | "\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\'" date) | 158 | "\\([^ \t,]+\\),[ \t]+\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\(T[ \t]+\\|\\)\\([0-9]+\\)[ \t]*\\'" date) |
| 149 | ;; Styles: (6) and (7) without timezone | 159 | ;; Styles: (6) and (7) without timezone |
| 150 | (setq year 6 month 3 day 2 time 4 zone nil)) | 160 | (setq year 6 month 3 day 2 time 4 zone nil)) |
| @@ -153,14 +163,6 @@ Understands the following styles: | |||
| 153 | ;; Styles: (6) and (7) with timezone and buggy timezone | 163 | ;; Styles: (6) and (7) with timezone and buggy timezone |
| 154 | (setq year 6 month 3 day 2 time 4 zone 7)) | 164 | (setq year 6 month 3 day 2 time 4 zone 7)) |
| 155 | ((string-match | 165 | ((string-match |
| 156 | "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\'" date) | ||
| 157 | ;; Styles: (1) and (2) without timezone | ||
| 158 | (setq year 3 month 2 day 1 time 4 zone nil)) | ||
| 159 | ((string-match | ||
| 160 | "\\([0-9]+\\)[ \t]+\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date) | ||
| 161 | ;; Styles: (1) and (2) with timezone and buggy timezone | ||
| 162 | (setq year 3 month 2 day 1 time 4 zone 5)) | ||
| 163 | ((string-match | ||
| 164 | "\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([0-9]+\\)" date) | 166 | "\\([^ \t,]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9:]+\\)[ \t]+\\([0-9]+\\)" date) |
| 165 | ;; Styles: (3) without timezone | 167 | ;; Styles: (3) without timezone |
| 166 | (setq year 4 month 1 day 2 time 3 zone nil)) | 168 | (setq year 4 month 1 day 2 time 3 zone nil)) |