# HG changeset patch
# User Edward M. Reingold <reingold@emr.cs.iit.edu>
# Date 830563987 0
# Node ID 66db908addc77d925a800a571ce5d30ec740c807
# Parent  77e6de616e58bed3e19498daf4cebe3ae898ce15
Double DST correction removed!

diff -r 77e6de616e58 -r 66db908addc7 lisp/calendar/solar.el
--- 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.