Mercurial > emacs
comparison lisp/calendar/solar.el @ 15095:66db908addc7
Double DST correction removed!
author | Edward M. Reingold <reingold@emr.cs.iit.edu> |
---|---|
date | Sat, 27 Apr 1996 00:13:07 +0000 |
parents | f353b7b88418 |
children | 68cce262538d |
comparison
equal
deleted
inserted
replaced
15094:77e6de616e58 | 15095:66db908addc7 |
---|---|
881 No diary entry if there is no sunset on that date." | 881 No diary entry if there is no sunset on that date." |
882 (if (not (and calendar-latitude calendar-longitude calendar-time-zone)) | 882 (if (not (and calendar-latitude calendar-longitude calendar-time-zone)) |
883 (solar-setup)) | 883 (solar-setup)) |
884 (if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday | 884 (if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday |
885 (let* ((sunset (car (cdr (solar-sunrise-sunset date)))) | 885 (let* ((sunset (car (cdr (solar-sunrise-sunset date)))) |
886 (light (if sunset | 886 (light (if sunset |
887 (dst-adjust-time | 887 (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset))))) |
888 date | 888 (if sunset |
889 (- (car sunset) (/ 18.0 60.0)))))) | |
890 (if (and light (calendar-date-equal date (car light))) | |
891 (format "%s Sabbath candle lighting" | 889 (format "%s Sabbath candle lighting" |
892 (apply 'solar-time-string (cdr light))))))) | 890 (apply 'solar-time-string light)))))) |
893 | 891 |
894 (defun solar-equinoxes/solstices (k year) | 892 (defun solar-equinoxes/solstices (k year) |
895 "Date of equinox/solstice K for YEAR. | 893 "Date of equinox/solstice K for YEAR. |
896 K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; | 894 K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; |
897 K=3, winter solstice. | 895 K=3, winter solstice. |