diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-07-09 23:18:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-07-09 23:18:36 -0700 |
| commit | d579dd370d27882722f2d510d76a8357ca7bec2f (patch) | |
| tree | e3724d5c0788fdbdbc144d6f2a599c1159408d6a /lisp/calc/calc-forms.el | |
| parent | 77cf71ce8cc611ecfd143277441e2ad4acc9401b (diff) | |
| download | emacs-d579dd370d27882722f2d510d76a8357ca7bec2f.tar.gz | |
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.
Diffstat (limited to 'lisp/calc/calc-forms.el')
| -rw-r--r-- | lisp/calc/calc-forms.el | 7 |
1 files changed, 1 insertions, 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))))))) |