Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix failing iCalendar tests when TZ=UTC

Browse source 
* lisp/calendar/diary-icalendar.el (diary-icalendar--tz-is-utc-p): New
function.
(diary-icalendar-convert-time-via-strategy): Don't expect a VTIMEZONE
for UTC times.
(diary-icalendar-export-region): Don't generate a VTIMEZONE for 'local
export strategy in UTC.
* test/lisp/calendar/diary-icalendar-tests.el
(diary-icalendar-test-entry-parser): Don't generate a VTIMEZONE for
'local export strategy in UTC.
This commit is contained in:
Richard Lawrence 2026-02-15 07:35:05 +01:00 committed by Michael Albinus
parent 9176826f41
commit 858cebd6c5
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/calendar/diary-icalendar.el
View file

@ -2468,6 +2468,10 @@ specification. END may be nil if no end time was specified."
;; Return the times: ;; Return the times:
(list start end))))) (list start end)))))
(defun di:-tz-is-utc-p ()
"Return non-nil if the current time zone is UTC."
(equal (current-time-zone) '(0 "UTC")))
(defun di:convert-time-via-strategy (dt &optional vtimezone) (defun di:convert-time-via-strategy (dt &optional vtimezone)
"Reinterpret the local time DT per the time zone export strategy. "Reinterpret the local time DT per the time zone export strategy.
@ -2484,7 +2488,8 @@ zone export strategy requires it."
(ical:date dt) (ical:date dt)
(ical:date-time (ical:date-time
(cond (cond
((or (eq 'local di:time-zone-export-strategy) ((or (and (eq 'local di:time-zone-export-strategy)
(not (di:-tz-is-utc-p)))
(listp di:time-zone-export-strategy)) (listp di:time-zone-export-strategy))
(unless (ical:vtimezone-component-p vtimezone) (unless (ical:vtimezone-component-p vtimezone)
(di:signal-export-error (di:signal-export-error
@ -2497,7 +2502,8 @@ zone export strategy requires it."
(if (decoded-time-zone dt) (if (decoded-time-zone dt)
(icr:tz-decode-time (encode-time dt) vtimezone) (icr:tz-decode-time (encode-time dt) vtimezone)
(icr:tz-set-zone dt vtimezone :error))) (icr:tz-set-zone dt vtimezone :error)))
((eq 'to-utc di:time-zone-export-strategy) ((or (eq 'to-utc di:time-zone-export-strategy)
(di:-tz-is-utc-p)) ; we're already in UTC, so mark dt as such
(decode-time (encode-time dt) t)) (decode-time (encode-time dt) t))
((eq 'floating di:time-zone-export-strategy) ((eq 'floating di:time-zone-export-strategy)
(setf (decoded-time-zone dt) nil) (setf (decoded-time-zone dt) nil)
@ -3408,11 +3414,12 @@ as well as variables in the customization group `diary-icalendar-export'."
(save-restriction (save-restriction
(narrow-to-region begin end) (narrow-to-region begin end)
(goto-char (point-min)) (goto-char (point-min))
(cond ((eq 'local di:time-zone-export-strategy) (cond ((listp di:time-zone-export-strategy)
(setq local-tz (di:current-tz-to-vtimezone)))
((listp di:time-zone-export-strategy)
(setq local-tz (di:current-tz-to-vtimezone (setq local-tz (di:current-tz-to-vtimezone
di:time-zone-export-strategy)))) di:time-zone-export-strategy)))
((and (eq 'local di:time-zone-export-strategy)
(not (di:-tz-is-utc-p))) ; don't generate a VTIMEZONE in UTC
(setq local-tz (di:current-tz-to-vtimezone))))
(while (re-search-forward di:entry-regexp nil t) (while (re-search-forward di:entry-regexp nil t)
(let ((entry-start (match-beginning 0)) (let ((entry-start (match-beginning 0))
(entry-end (match-end 0)) (entry-end (match-end 0))
@ -3431,7 +3438,8 @@ as well as variables in the customization group `diary-icalendar-export'."
:buffer (current-buffer)))) :buffer (current-buffer))))
(goto-char (1+ entry-end)))) (goto-char (1+ entry-end))))
(setq components (nreverse components)) (setq components (nreverse components))
(when local-tz (push local-tz components)) (when (ical:vtimezone-component-p local-tz)
(push local-tz components))
(ical:condition-case err-data (ical:condition-case err-data
(setq vcalendar (ical:make-vcalendar (@ components)))) (setq vcalendar (ical:make-vcalendar (@ components))))

3
test/lisp/calendar/diary-icalendar-tests.el
View file

@ -792,7 +792,8 @@ SOURCE, if given, should be a symbol; it is used to name the test."
"Call `di:parse-entry' on the full test buffer" "Call `di:parse-entry' on the full test buffer"
(let ((tz (let ((tz
(cond (cond
((eq 'local di:time-zone-export-strategy) ((and (eq 'local di:time-zone-export-strategy)
(not (di:-tz-is-utc-p)))
(di:current-tz-to-vtimezone)) (di:current-tz-to-vtimezone))
((listp di:time-zone-export-strategy) ((listp di:time-zone-export-strategy)
(di:current-tz-to-vtimezone di:time-zone-export-strategy))))) (di:current-tz-to-vtimezone di:time-zone-export-strategy)))))