Mercurial > emacs

changeset 93753:a0a31b0153ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(diary-hebrew-sabbath-candles): Simplify.
author Glenn Morris <rgm@gnu.org>
date Sat, 05 Apr 2008 21:27:42 +0000
parents d4138138d39d
children 049a94319334
files lisp/calendar/cal-hebrew.el
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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