aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert1993-09-06 22:37:51 +0000
committerPaul Eggert1993-09-06 22:37:51 +0000
commitd6fc04a8ca1507e4b5e1a286d6aa42893e9ff480 (patch)
tree492bec2dd4184fa5be11d5953c42dba9107ae70b
parentadd3312f115db81c30b3e1405a5edcb5be8bbda0 (diff)
downloademacs-d6fc04a8ca1507e4b5e1a286d6aa42893e9ff480.tar.gz
emacs-d6fc04a8ca1507e4b5e1a286d6aa42893e9ff480.zip
(calendar-time-zone-daylight-rules): Remove special case for Israel.
Israel has changed its daylight savings time rules, and we don't know what the current rules are.
-rw-r--r--lisp/calendar/cal-dst.el34
1 files changed, 5 insertions, 29 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index 2608a15c17c..15ce7cd722a 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -153,21 +153,7 @@ The result has the proper form for calendar-daylight-savings-starts'."
153 (cons 153 (cons
154 (list 'calendar-nth-named-day 1 weekday m 'year j) 154 (list 'calendar-nth-named-day 1 weekday m 'year j)
155 l))) 155 l)))
156 l) 156 l)))
157 ;; Israel is special.
158 (if (zerop weekday)
159 (if (< m 7)
160 (list
161 '(calendar-gregorian-from-absolute
162 (calendar-dayname-on-or-before
163 0
164 (calendar-absolute-from-hebrew
165 (list 1 28 (+ year 3760))))))
166 (list '(calendar-gregorian-from-absolute
167 (calendar-dayname-on-or-before
168 0
169 (- (calendar-absolute-from-hebrew
170 (list 7 1 (+ year 3761))) 3))))))))
171 (prevday-sec (- -1 utc-diff)) ;; last sec of previous local day 157 (prevday-sec (- -1 utc-diff)) ;; last sec of previous local day
172 (year (1+ y))) 158 (year (1+ y)))
173 ;; Scan through the next few years until only one rule remains. 159 ;; Scan through the next few years until only one rule remains.
@@ -310,15 +296,9 @@ you would set `calendar-daylight-savings-starts' to
310 296
311 '(10 1 year) 297 '(10 1 year)
312 298
313For a more complex example, daylight savings time begins in Israel on the 299If it starts on the first Sunday in April, you would set it to
314first Sunday after Passover ends on Nisan 21:
315 300
316 '(calendar-gregorian-from-absolute 301 '(calendar-nth-named-day 1 0 4 year)
317 (calendar-dayname-on-or-before
318 0
319 (calendar-absolute-from-hebrew (list 1 28 (+ year 3760)))))
320
321because Nisan is the first month in the Hebrew calendar.
322 302
323If the locale never uses daylight savings time, set this to nil.") 303If the locale never uses daylight savings time, set this to nil.")
324 304
@@ -332,13 +312,9 @@ date in the form (month day year) on which daylight savings time ends. It is
332used to determine the starting date of daylight savings time for the holiday 312used to determine the starting date of daylight savings time for the holiday
333list and for correcting times of day in the solar and lunar calculations. 313list and for correcting times of day in the solar and lunar calculations.
334 314
335For example, daylight savings time ends in Israel on the Sunday Selichot 315For example, if daylight savings time ends on the last Sunday in October:
336begins:
337 316
338 '(calendar-gregorian-from-absolute 317 '(calendar-nth-named-day -1 0 10 year)
339 (calendar-dayname-on-or-before
340 0
341 (- (calendar-absolute-from-hebrew (list 7 1 (+ year 3761))) 3)))
342 318
343If the locale never uses daylight savings time, set this to nil.") 319If the locale never uses daylight savings time, set this to nil.")
344 320