Mercurial > emacs

changeset 15095:66db908addc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Double DST correction removed!
author Edward M. Reingold <reingold@emr.cs.iit.edu>
date Sat, 27 Apr 1996 00:13:07 +0000
parents 77e6de616e58
children c62cd2650ced
files lisp/calendar/solar.el
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/solar.el	Fri Apr 26 19:56:17 1996 +0000
+++ b/lisp/calendar/solar.el	Sat Apr 27 00:13:07 1996 +0000
@@ -883,13 +883,11 @@
       (solar-setup))
   (if (= (% (calendar-absolute-from-gregorian date) 7) 5);;  Friday
       (let* ((sunset (car (cdr (solar-sunrise-sunset date))))
-	     (light (if sunset
-                        (dst-adjust-time
-                         date
-                         (- (car sunset) (/ 18.0 60.0))))))
-        (if (and light (calendar-date-equal date (car light)))
+                  (light (if sunset
+                        (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset)))))
+        (if sunset
             (format "%s Sabbath candle lighting"
-                    (apply 'solar-time-string (cdr light)))))))
+                    (apply 'solar-time-string light))))))
 
 (defun solar-equinoxes/solstices (k year)
   "Date of equinox/solstice K for YEAR.