1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00

Simplify math-get-calendar-tzinfo

* lisp/calc/calc-forms.el (calendar-current-time-zone-cache):
Remove defvar.
(math-get-calendar-tzinfo): Simplify and do not reach
into caldst’s cache.
This commit is contained in:
Paul Eggert 2019-07-09 23:18:13 -07:00
parent 77cf71ce8c
commit d579dd370d

View file

@ -1472,9 +1472,6 @@ as measured in the integer number of days before December 31, 1 BC (Gregorian)."
(defvar var-TimeZone nil)
;; From cal-dst
(defvar calendar-current-time-zone-cache)
(defvar math-calendar-tzinfo
nil
"Information about the timezone, retrieved from the calendar.")
@ -1487,9 +1484,7 @@ second, the number of seconds offset for daylight savings."
(if math-calendar-tzinfo
math-calendar-tzinfo
(require 'cal-dst)
(let ((tzinfo (progn
(calendar-current-time-zone)
calendar-current-time-zone-cache)))
(let ((tzinfo (calendar-current-time-zone)))
(setq math-calendar-tzinfo
(list (* 60 (- (nth 0 tzinfo)))
(* 60 (nth 1 tzinfo)))))))