diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-09 12:34:23 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-09 12:34:23 +0200 |
| commit | 3c728d4c69f2abe991ef84787ae1014ad1cd29d2 (patch) | |
| tree | 142e94a83742239713e5b940eb7a50af324efd8f /lisp/calendar/solar.el | |
| parent | f3e0da29a248a2dc7dd7d640f8280b10bfc288f9 (diff) | |
| download | emacs-3c728d4c69f2abe991ef84787ae1014ad1cd29d2.tar.gz | |
Add a variable to allow displaying numeric time zones
* lisp/calendar/calendar.el (calendar-use-numeric-time-zones): New
variable.
* doc/emacs/calendar.texi (Sunrise/Sunset): Document it (bug#33149).
* lisp/calendar/cal-dst.el (calendar-standard-time-zone-name): Use it.
(calendar-daylight-time-zone-name): Ditto.
* lisp/calendar/solar.el (sunrise-sunset): Adjust usage.
(solar-equinoxes-solstices): Ditto.
Diffstat (limited to 'lisp/calendar/solar.el')
| -rw-r--r-- | lisp/calendar/solar.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 6a813e9ee82..20a20df4603 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -840,7 +840,9 @@ 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) "UTC") + (cond ((zerop calendar-time-zone) + (if calendar-use-numeric-time-zones + "+0100" "UTC")) ((< calendar-time-zone 0) (format "UTC%dmin" calendar-time-zone)) (t (format "UTC+%dmin" calendar-time-zone))))) @@ -1013,7 +1015,10 @@ Requires floating point." (let* ((m displayed-month) (y displayed-year) (calendar-standard-time-zone-name - (if calendar-time-zone calendar-standard-time-zone-name "UTC")) + (cond + (calendar-time-zone calendar-standard-time-zone-name) + (calendar-use-numeric-time-zones "+0100") + (t "UTC"))) (calendar-daylight-savings-starts (if calendar-time-zone calendar-daylight-savings-starts)) (calendar-daylight-savings-ends |