From 007e66bccb2cb8382158e5e24727fd1b4478cd69 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 29 Dec 2022 19:16:09 -0800 Subject: [PATCH 4/6] Use RFC 822 abbrevs in sunrise-sunset strings * lisp/calendar/solar.el (sunrise-sunset): Use RFC 822 time zone abbreviations like "+0530" instead of idiosyncratic abbreviations like "UTC+330min". --- lisp/calendar/solar.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 8f501824bb..0b5bc16653 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -839,12 +839,10 @@ sunrise-sunset "E" "W")))))) (calendar-standard-time-zone-name (if (< arg 16) calendar-standard-time-zone-name - (cond ((zerop calendar-time-zone) - (if (eq calendar-time-zone-style 'numeric) - "+0000" "UTC")) - ((< calendar-time-zone 0) - (format "UTC%dmin" calendar-time-zone)) - (t (format "UTC+%dmin" calendar-time-zone))))) + (if (and (zerop calendar-time-zone) + (not (eq calendar-time-zone-style 'numeric))) + "UTC" + (format-time-string "%z" 0 (* 60 calendar-time-zone))))) (calendar-daylight-savings-starts (if (< arg 16) calendar-daylight-savings-starts)) (calendar-daylight-savings-ends -- 2.38.1