[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108062: * calendar/cal-dst.el (calendar-current-time-zone): Return

[Andreas Schwab]

------------------------------------------------------------
revno: 108062
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2012-06-28 14:13:38 +0200
message:
  * calendar/cal-dst.el (calendar-current-time-zone): Return
  calendar-current-time-zone-cache if non-nil.
modified:
  lisp/ChangeLog
  lisp/calendar/cal-dst.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-25 07:11:03 +0000
+++ b/lisp/ChangeLog    2012-06-28 12:13:38 +0000
@@ -1,3 +1,8 @@
+2012-06-28  Andreas Schwab  <address@hidden>
+
+       * calendar/cal-dst.el (calendar-current-time-zone): Return
+       calendar-current-time-zone-cache if non-nil.
+
 2012-06-25  Masatake YAMATO  <address@hidden>
 
        * progmodes/which-func.el (which-func-format):

=== modified file 'lisp/calendar/cal-dst.el'
--- a/lisp/calendar/cal-dst.el  2012-01-19 07:21:25 +0000
+++ b/lisp/calendar/cal-dst.el  2012-06-28 12:13:38 +0000
@@ -347,8 +347,8 @@
 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