summaryrefslogtreecommitdiff
path: root/lisp/calendar/cal-dst.el
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-06-28 14:13:38 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-06-28 14:13:38 +0200
commit3d8b9024adf6136edd3f7b7edf70a88b6ab8a61b (patch)
tree96c3e6ba0b3e8a8a9ca356573ae548bb5c9da46a /lisp/calendar/cal-dst.el
parent538044ed9ee796084f07100dd8c72f44c338ca3b (diff)
downloademacs-3d8b9024adf6136edd3f7b7edf70a88b6ab8a61b.tar.gz
* calendar/cal-dst.el (calendar-current-time-zone): Return
calendar-current-time-zone-cache if non-nil.
Diffstat (limited to 'lisp/calendar/cal-dst.el')
-rw-r--r--lisp/calendar/cal-dst.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index e3996cae3de..4af3ea53ab3 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -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