From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 10 Jul 2019 06:18:13 +0000 (-0700)
Subject: Simplify math-get-calendar-tzinfo
X-Git-Tag: emacs-27.0.90~2023
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d579dd370d27882722f2d510d76a8357ca7bec2f;p=emacs.git

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

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)))))))