(calendar-time-zone-daylight-rules): Reset

new-rules after each round.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c382434..0b1c0f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-04  Andreas Schwab  <schwab@suse.de>
 
+       * calendar/cal-dst.el (calendar-time-zone-daylight-rules): Reset
+       new-rules after each round.
+
        * Makefile.in (cal-autoloads): New target.
        (compile, compile-always, recompile): Depend on it.
        ($(lisp)/calendar/cal-loaddefs.el)

diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 57aa87c..cceb39e 100644 (file)
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -240,7 +240,8 @@ The result has the proper form for `calendar-daylight-savings-starts'."
       ;; it's wrong in general, but it's right for at least one year.
       (setq candidate-rules (if new-rules (nreverse new-rules)
                               (list (car candidate-rules)))
-            year (1+ year)))
+           new-rules nil
+           year (1+ year)))
     (car candidate-rules)))
 
 ;; TODO it might be better to extract this information directly from