(vc-mcvs-diff): Don't diff asynchronously if vc-disable-async-diff is

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

diff --git a/lisp/timezone.el b/lisp/timezone.el
index d647315..bad269d 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,15 +187,15 @@ 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 \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
-           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+\\([0-9]+:[0-9]+:[0-9]+\\)" date)
+           "\\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\)[T \t]+\\([0-9]+:[0-9]+:[0-9]+\\)" date)
           ;; Styles: (8) without timezone.
           (setq year 1 month 2 day 3 time 4 zone nil))
          )
@@ -339,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.
@@ -401,4 +397,5 @@ The Gregorian date Sunday, December 31, 1 BC is imaginary."
 
 (provide 'timezone)
 
+;;; arch-tag: e23d5bc6-f32d-48ba-8996-323e9d654b3f
 ;;; timezone.el ends here