diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-20 09:47:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-20 09:48:02 -0700 |
| commit | 136dd7bc02576a10ea77b33afd3cb9179c064e3d (patch) | |
| tree | 77d31beb6a7da146c6b1de8b2d911c5e6bd31609 /lisp/calendar/icalendar.el | |
| parent | 057f93499eb0491ef816b71523242e18ae810cd5 (diff) | |
| download | emacs-136dd7bc02576a10ea77b33afd3cb9179c064e3d.tar.gz | |
Simplify icalendar decoding of Z dates
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
Simplify calculation of time strings with trailing "Z".
Diffstat (limited to 'lisp/calendar/icalendar.el')
| -rw-r--r-- | lisp/calendar/icalendar.el | 8 |
1 files changed, 1 insertions, 7 deletions
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 |