aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-06-10 01:32:55 +0000
committerGlenn Morris2009-06-10 01:32:55 +0000
commitb27c3bc6ec03f081147746a65e05fb5393a91dc9 (patch)
tree82fcd5da465f32cc3dec03a090d0155d858fd930
parent9903d1e69c79a0260a2747206e48e44b862b9ac1 (diff)
downloademacs-b27c3bc6ec03f081147746a65e05fb5393a91dc9.tar.gz
emacs-b27c3bc6ec03f081147746a65e05fb5393a91dc9.zip
(calendar-time-zone-daylight-rules): Fix typo in 2008-04-02 change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/cal-dst.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfab7c2065e..a4d04659aad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-06-10 Glenn Morris <rgm@gnu.org>
2
3 * calendar/cal-dst.el (calendar-time-zone-daylight-rules):
4 Fix typo in 2008-04-02 change.
5
12009-06-10 Kenichi Handa <handa@m17n.org> 62009-06-10 Kenichi Handa <handa@m17n.org>
2 7
3 * composite.el (compose-gstring-for-terminal): For zero-width 8 * composite.el (compose-gstring-for-terminal): For zero-width
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 1478a6ca29d..0bcb61b4d42 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -229,7 +229,7 @@ The result has the proper form for `calendar-daylight-savings-starts'."
229 (setq date (cond ((eq (car rule) 'calendar-nth-named-day) 229 (setq date (cond ((eq (car rule) 'calendar-nth-named-day)
230 (eval (cons 'calendar-nth-named-absday (cdr rule)))) 230 (eval (cons 'calendar-nth-named-absday (cdr rule))))
231 ((eq (car rule) 'calendar-gregorian-from-absolute) 231 ((eq (car rule) 'calendar-gregorian-from-absolute)
232 (eval (cdr rule))) 232 (eval (cadr rule)))
233 (t (calendar-absolute-from-gregorian (eval rule))))) 233 (t (calendar-absolute-from-gregorian (eval rule)))))
234 (or (equal (current-time-zone 234 (or (equal (current-time-zone
235 (calendar-time-from-absolute date prevday-sec)) 235 (calendar-time-from-absolute date prevday-sec))