From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Jul 2015 16:47:39 +0000 (-0700)
Subject: Simplify icalendar decoding of Z dates
X-Git-Tag: emacs-25.0.90~1458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=136dd7bc02576a10ea77b33afd3cb9179c064e3d;p=emacs.git

Simplify icalendar decoding of Z dates

* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
Simplify calculation of time strings with trailing "Z".
---

diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index da5d85eaf24..3e2a2f8a858 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -618,13 +618,7 @@ FIXME: multiple comma-separated values should be allowed!"
         (when (and (> (length isodatetimestring) 15)
                    ;; UTC specifier present
                    (char-equal ?Z (aref isodatetimestring 15)))
-          ;; if not UTC add current-time-zone offset
-          ;; 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)))
+          (setq zone t))
         ;; shift if necessary
         (if day-shift
             (let ((mdy (calendar-gregorian-from-absolute