[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v |
Date: |
Sat, 05 Apr 2008 21:27:43 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/05 21:27:42
Index: cal-hebrew.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-hebrew.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- cal-hebrew.el 5 Apr 2008 21:24:15 -0000 1.60
+++ cal-hebrew.el 5 Apr 2008 21:27:42 -0000 1.61
@@ -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
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/01
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/03
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/04
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/05
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Stefan Monnier, 2008/04/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,v, Glenn Morris, 2008/04/11