aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-12-24 02:58:41 +0000
committerRichard M. Stallman2006-12-24 02:58:41 +0000
commited589f9aa29fc19ec15c9900aa5c77b6a6c9614d (patch)
treeff204f17622d21d1e816c0502d6b6534996ba852
parentbe064bc4bf89e8789a4ba72e6606cf12f97af93c (diff)
downloademacs-ed589f9aa29fc19ec15c9900aa5c77b6a6c9614d.tar.gz
emacs-ed589f9aa29fc19ec15c9900aa5c77b6a6c9614d.zip
(calendar-dst-starts): Default to second Sunday in March.
(calendar-dst-ends): Default to first Sunday in November.
-rw-r--r--lisp/calendar/cal-dst.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index aed4c32e3db..2f7e4ac88fd 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -53,7 +53,8 @@ change."
53 :group 'calendar) 53 :group 'calendar)
54 54
55(defvar calendar-current-time-zone-cache nil 55(defvar calendar-current-time-zone-cache nil
56 "Cache for result of calendar-current-time-zone.") 56 "Cache for result of `calendar-current-time-zone'.")
57(put 'calendar-current-time-zone-cache 'risky-local-variable t)
57 58
58(defvar calendar-system-time-basis 59(defvar calendar-system-time-basis
59 (calendar-absolute-from-gregorian '(1 1 1970)) 60 (calendar-absolute-from-gregorian '(1 1 1970))
@@ -346,7 +347,7 @@ This function respects the value of `calendar-dst-check-each-year-flag'."
346 (nth 4 calendar-current-time-zone-cache)))) 347 (nth 4 calendar-current-time-zone-cache))))
347 (if expr (eval expr))) 348 (if expr (eval expr)))
348 (and (not (zerop calendar-daylight-time-offset)) 349 (and (not (zerop calendar-daylight-time-offset))
349 (calendar-nth-named-day 1 0 4 year)))) 350 (calendar-nth-named-day 2 0 3 year))))
350 351
351(defun calendar-dst-ends (year) 352(defun calendar-dst-ends (year)
352 "Return the date of YEAR on which Daylight Saving Time ends. 353 "Return the date of YEAR on which Daylight Saving Time ends.
@@ -356,7 +357,7 @@ This function respects the value of `calendar-dst-check-each-year-flag'."
356 (nth 5 calendar-current-time-zone-cache)))) 357 (nth 5 calendar-current-time-zone-cache))))
357 (if expr (eval expr))) 358 (if expr (eval expr)))
358 (and (not (zerop calendar-daylight-time-offset)) 359 (and (not (zerop calendar-daylight-time-offset))
359 (calendar-nth-named-day -1 0 10 year)))) 360 (calendar-nth-named-day 1 0 11 year))))
360 361
361 362
362;;;###autoload 363;;;###autoload