(completion-ignored-extensions) [ms-dos, windows-nt]:

[bpt/emacs.git] / lisp / timezone.el

diff --git a/lisp/timezone.el b/lisp/timezone.el
index 8f21f8f..7e1fe70 100644 (file)
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -23,6 +23,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
 (defvar timezone-world-timezones
@@ -120,7 +122,10 @@ Optional argument TIMEZONE specifies a time zone."
 
 (defun timezone-parse-date (date)
   "Parse DATE and return a vector [YEAR MONTH DAY TIME TIMEZONE].
-19 is prepended to year if necessary.  Timezone may be nil if nothing.
+Two-digit dates are `windowed'.  Those <69 have 2000 added; otherwise 1900
+is added.  Three-digit dates have 1900 added.
+TIMEZONE is nil for DATEs without a zone field.
+
 Understands the following styles:
  (1) 14 Apr 89 03:20[:12] [GMT]
  (2) Fri, 17 Mar 89 4:01[:33] [GMT]
@@ -182,11 +187,11 @@ Understands the following styles:
           ;; Styles: (5) without timezone.
           (setq year 3 month 2 day 1 time 4 zone nil))
          ((string-match
-           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)[ \t]*\\([-+a-zA-Z0-9]+\\)" date)
+           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)[ \t]+\\([-+a-zA-Z0-9]+\\)" date)
           ;; Styles: (8) with timezone.
           (setq year 1 month 2 day 3 time 4 zone 5))
          ((string-match
-           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+\\)[ \t]*\\([-+a-zA-Z0-9:]+\\)" date)
+           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+\\)[ \t]+\\([-+a-zA-Z0-9:]+\\)" date)
           ;; Styles: (8) with timezone with a colon in it.
           (setq year 1 month 2 day 3 time 4 zone 5))
          ((string-match
@@ -197,8 +202,8 @@ Understands the following styles:
     (when year
       (setq year (match-string year date))
       ;; Guess ambiguous years.  Assume years < 69 don't predate the
-      ;; Unix Epoch, so are 2000+.  Three-digit years -- do they ever
-      ;; occur? -- are (arbitrarily) assumed to be 21st century.
+      ;; Unix Epoch, so are 2000+.  Three-digit years are assumed to
+      ;; be relative to 1900.
       (if (< (length year) 4)
          (let ((y (string-to-int year)))
            (if (< y 69)
@@ -310,10 +315,12 @@ If LOCAL is nil, it is assumed to be GMT.
 If TIMEZONE is nil, use the local time zone."
   (let* ((date   (timezone-parse-date date))
         (year   (string-to-int (aref date 0)))
-        (year   (cond ((< year 50)
+        (year   (cond ((< year 69)
                        (+ year 2000))
                       ((< year 100)
                        (+ year 1900))
+                      ((< year 1000)   ; possible 3-digit years.
+                       (+ year 1900))
                       (t year)))
         (month  (string-to-int (aref date 1)))
         (day    (string-to-int (aref date 2)))
@@ -337,30 +344,21 @@ If TIMEZONE is nil, use the local time zone."
     (cond ((<= 24 hour)                        ;24 -> 00
           (setq hour (- hour 24))
           (setq day  (1+ day))
-          (if (< (timezone-last-day-of-month month year) day)
-              (progn
-                (setq month (1+ month))
-                (setq day 1)
-                (if (< 12 month)
-                    (progn
-                      (setq month 1)
-                      (setq year (1+ year))
-                      ))
-                )))
+          (when (< (timezone-last-day-of-month month year) day)
+            (setq month (1+ month))
+            (setq day 1)
+            (when (< 12 month)
+              (setq month 1)
+              (setq year (1+ year)))))
          ((> 0 hour)
           (setq hour (+ hour 24))
           (setq day  (1- day))
-          (if (> 1 day)
-              (progn
-                (setq month (1- month))
-                (if (> 1 month)
-                    (progn
-                      (setq month 12)
-                      (setq year (1- year))
-                      ))
-                (setq day (timezone-last-day-of-month month year))
-                )))
-         )
+          (when (> 1 day)
+            (setq month (1- month))
+            (when (> 1 month)
+              (setq month 12)
+              (setq year (1- year)))
+            (setq day (timezone-last-day-of-month month year)))))
     (vector year month day hour minute second timezone)))
 
 ;; Partly copied from Calendar program by Edward M. Reingold.