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

calendar-current-time-zone-cache if non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab355217b9ebd832499c2466a05c3bffdb550cf4..9373bf14fbb75f9f748112d8dbf16b32b2103735 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index e3996cae3de6c3a59084bb0261132e56ec7efe0c..4af3ea53ab347072dfb899ac2fe9aef66c54b3dd 100644 (file)
--- 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