diff options
| author | Andreas Schwab | 2008-04-04 11:43:39 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-04-04 11:43:39 +0000 |
| commit | e6fa807c5ae9f8c5aecc7b99b03fbe54c4085dd5 (patch) | |
| tree | e1787cf0b391aaad6c8e5a9ba79acf0bfc6007a9 | |
| parent | 42a835e53ca8748f2c874e9103694136d93c448d (diff) | |
| download | emacs-e6fa807c5ae9f8c5aecc7b99b03fbe54c4085dd5.tar.gz emacs-e6fa807c5ae9f8c5aecc7b99b03fbe54c4085dd5.zip | |
(calendar-time-zone-daylight-rules): Reset
new-rules after each round.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/calendar/cal-dst.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3824345190..0b1c0f03a80 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-04-04 Andreas Schwab <schwab@suse.de> | 1 | 2008-04-04 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * calendar/cal-dst.el (calendar-time-zone-daylight-rules): Reset | ||
| 4 | new-rules after each round. | ||
| 5 | |||
| 3 | * Makefile.in (cal-autoloads): New target. | 6 | * Makefile.in (cal-autoloads): New target. |
| 4 | (compile, compile-always, recompile): Depend on it. | 7 | (compile, compile-always, recompile): Depend on it. |
| 5 | ($(lisp)/calendar/cal-loaddefs.el) | 8 | ($(lisp)/calendar/cal-loaddefs.el) |
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 57aa87c3a80..cceb39e342d 100644 --- 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'." | |||
| 240 | ;; it's wrong in general, but it's right for at least one year. | 240 | ;; it's wrong in general, but it's right for at least one year. |
| 241 | (setq candidate-rules (if new-rules (nreverse new-rules) | 241 | (setq candidate-rules (if new-rules (nreverse new-rules) |
| 242 | (list (car candidate-rules))) | 242 | (list (car candidate-rules))) |
| 243 | year (1+ year))) | 243 | new-rules nil |
| 244 | year (1+ year))) | ||
| 244 | (car candidate-rules))) | 245 | (car candidate-rules))) |
| 245 | 246 | ||
| 246 | ;; TODO it might be better to extract this information directly from | 247 | ;; TODO it might be better to extract this information directly from |