* calendar/cal-dst.el (calendar-current-time-zone): Return

calendar-current-time-zone-cache if non-nil.
This commit is contained in:
Andreas Schwab 2012-06-28 14:13:38 +02:00
parent 538044ed9e
commit 3d8b9024ad
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2012-06-28 Andreas Schwab <schwab@linux-m68k.org>
* calendar/cal-dst.el (calendar-current-time-zone): Return
calendar-current-time-zone-cache if non-nil.
2012-06-25 Masatake YAMATO <yamato@redhat.com>
* progmodes/which-func.el (which-func-format):

View file

@ -347,8 +347,8 @@ DST-ZONE are equal, and all the DST-* integer variables are 0.
Some operating systems cannot provide all this information to Emacs; in this
case, `calendar-current-time-zone' returns a list containing nil for the data
it can't find."
(unless calendar-current-time-zone-cache
(setq calendar-current-time-zone-cache (calendar-dst-find-data))))
(or calendar-current-time-zone-cache
(setq calendar-current-time-zone-cache (calendar-dst-find-data))))
;; Following options should be set based on conditions when the code