diff options
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/calendar/cal-dst.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab355217b9e..9373bf14fbb 100644 --- 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 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 |