From d579dd370d27882722f2d510d76a8357ca7bec2f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 9 Jul 2019 23:18:13 -0700 Subject: [PATCH] Simplify math-get-calendar-tzinfo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * 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. --- lisp/calc/calc-forms.el | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el index 8faeb0a9dec..eb1a8248cdf 100644 --- a/lisp/calc/calc-forms.el +++ b/lisp/calc/calc-forms.el @@ -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))))))) -- 2.39.5