Fix Bug#15408 (icalendar time zone problem)

2014-07-30 Christophe Deleuze <christophe.deleuze@free.fr>

	* calendar/icalendar.el (icalendar--decode-isodatetime): Use
	actual current-time-zone when converting to local time. (Bug#15408)

2014-07-30  Ulf Jasper  <ulf.jasper@web.de>

	* automated/icalendar-tests.el (icalendar--decode-isodatetime): New test.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a89b46bf144c776fdd60b49c05d0a3ee53943e66..5bebc3af3b953904c81b21d4abbaf9d839b5c1b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-30 Christophe Deleuze <christophe.deleuze@free.fr>
+
+       * calendar/icalendar.el (icalendar--decode-isodatetime): Use
+       actual current-time-zone when converting to local time. (Bug#15408)
+
 2014-07-29  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window--state-put-2): Handle horizontal scroll

diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 4ba4869d78854beec82bb9454658c919b4b76943..9aefcac23141ff64dbd51a0097c83168c4643d7d 100644 (file)
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -563,7 +563,12 @@ FIXME: multiple comma-separated values should be allowed!"
                    ;; UTC specifier present
                    (char-equal ?Z (aref isodatetimestring 15)))
           ;; if not UTC add current-time-zone offset
-          (setq second (+ (car (current-time-zone)) second)))
+          ;; current-time-zone should be called with actual UTC time
+          ;; (daylight saving at that time may differ to current one)
+          (setq second (+ (car (current-time-zone
+                                (encode-time second minute hour day month year
+                                             0)))
+                          second)))
         ;; shift if necessary
         (if day-shift
             (let ((mdy (calendar-gregorian-from-absolute

diff --git a/test/ChangeLog b/test/ChangeLog
index 140b5d04efd6e1be689252546fc55b80ae061187..4e47f95b066c41ab984851c4f1da7a05b6877a8a 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-30  Ulf Jasper  <ulf.jasper@web.de>
+
+       * automated/icalendar-tests.el (icalendar--decode-isodatetime): New test.
+
 2014-07-28  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * automated/timer-tests.el (timer-tests-debug-timer-check): New test.

diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 7b51f907d38c7de74d231c4a4067eafc99e5e8da..2ffa3911ee316558b3333b6a5b81ec8024d0645d 100644 (file)
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -414,6 +414,38 @@ END:VEVENT
     (should (not result))
     ))
 
+(ert-deftest icalendar--decode-isodatetime ()
+  "Test `icalendar--decode-isodatetime'."
+  (let ((tz (getenv "TZ"))
+       result)
+    (unwind-protect
+       (progn
+         ;; Use Eastern European Time (UTC+1, UTC+2 daylight saving)
+         (setenv "TZ" "EET")
+
+          (message "%s" (current-time-zone (encode-time 0 0 10 1 1 2013 0)))
+          (message "%s" (current-time-zone (encode-time 0 0 10 1 8 2013 0)))
+
+          ;; testcase: no time zone in input -> keep time as is
+          ;; 1 Jan 2013 10:00
+          (should (equal '(0 0 10 1 1 2013 2 nil 7200)
+                         (icalendar--decode-isodatetime "20130101T100000")))
+          ;; 1 Aug 2013 10:00 (DST)
+          (should (equal '(0 0 10 1 8 2013 4 t 10800)
+                         (icalendar--decode-isodatetime "20130801T100000")))
+
+          ;; testcase: UTC time zone specifier in input -> convert to local time
+          ;; 31 Dec 2013 23:00 UTC -> 1 Jan 2013 01:00 EET
+          (should (equal '(0 0 1 1 1 2014 3 nil 7200)
+                         (icalendar--decode-isodatetime "20131231T230000Z")))
+          ;; 1 Aug 2013 10:00 UTC -> 1 Aug 2013 13:00 EEST
+          (should (equal '(0 0 13 1 8 2013 4 t 10800)
+                         (icalendar--decode-isodatetime "20130801T100000Z")))
+
+          )
+      ;; restore time-zone even if something went terribly wrong
+      (setenv "TZ" tz)))  )
+
 ;; ======================================================================
 ;; Export tests
 ;; ======================================================================