# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1207430862 0
# Node ID a0a31b0153ed9347284a042c4fe030ff98e228c3
# Parent  d4138138d39d2033e13a81e8fa1b85189fa72e57
(diary-hebrew-sabbath-candles): Simplify.

diff -r d4138138d39d -r a0a31b0153ed lisp/calendar/cal-hebrew.el
--- a/lisp/calendar/cal-hebrew.el	Sat Apr 05 21:25:45 2008 +0000
+++ b/lisp/calendar/cal-hebrew.el	Sat Apr 05 21:27:42 2008 +0000
@@ -1145,15 +1145,15 @@
   (or (and calendar-latitude calendar-longitude calendar-time-zone)
       (solar-setup))
   (if (= (% (calendar-absolute-from-gregorian date) 7) 5) ; Friday
-      (let* ((sunset (cadr (solar-sunrise-sunset date)))
-             (light (if sunset
-                        (cons (- (car sunset)
-                                 (/ diary-hebrew-sabbath-candles-minutes 60.0))
-                              (cdr sunset)))))
+      (let ((sunset (cadr (solar-sunrise-sunset date))))
         (if sunset
-            (cons mark
-                  (format "%s Sabbath candle lighting"
-                          (apply 'solar-time-string light)))))))
+            (cons mark (format
+                        "%s Sabbath candle lighting"
+                        (apply 'solar-time-string
+                               (cons (- (car sunset)
+                                        (/ diary-hebrew-sabbath-candles-minutes
+                                           60.0))
+                                     (cdr sunset)))))))))
 
 ;;;###diary-autoload
 (define-obsolete-function-alias 'diary-sabbath-candles