From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 30 Dec 2022 03:16:09 +0000 (-0800)
Subject: Use RFC 822 abbrevs in sunrise-sunset strings
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=007e66bccb2cb8382158e5e24727fd1b4478cd69;p=emacs.git

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".
---

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 8f501824bb0..0b5bc166530 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -839,12 +839,10 @@ This function is suitable for execution in an init file."
                             "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