[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el |
Date: |
Mon, 22 Jul 2002 11:30:24 -0400 |
Index: emacs/lisp/calendar/solar.el
diff -c emacs/lisp/calendar/solar.el:1.43 emacs/lisp/calendar/solar.el:1.44
*** emacs/lisp/calendar/solar.el:1.43 Thu Apr 4 15:52:47 2002
--- emacs/lisp/calendar/solar.el Mon Jul 22 11:30:24 2002
***************
*** 920,928 ****
:type 'integer
:version "21.1")
! (defun diary-sabbath-candles ()
"Local time of candle lighting diary entry--applies if date is a Friday.
! No diary entry if there is no sunset on that date."
(if (not (and calendar-latitude calendar-longitude calendar-time-zone))
(solar-setup))
(if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday
--- 920,931 ----
:type 'integer
:version "21.1")
! (defun diary-sabbath-candles (&optional mark)
"Local time of candle lighting diary entry--applies if date is a Friday.
! No diary entry if there is no sunset on that date.
!
! An optional parameter MARK specifies a face or single-character string to
! use when highlighting the day in the calendar."
(if (not (and calendar-latitude calendar-longitude calendar-time-zone))
(solar-setup))
(if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday
***************
*** 932,939 ****
(/ diary-sabbath-candles-minutes 60.0))
(cdr sunset)))))
(if sunset
! (format "%s Sabbath candle lighting"
! (apply 'solar-time-string light))))))
(defun solar-equinoxes/solstices (k year)
"Date of equinox/solstice K for YEAR.
--- 935,943 ----
(/ diary-sabbath-candles-minutes 60.0))
(cdr sunset)))))
(if sunset
! (cons mark
! (format "%s Sabbath candle lighting"
! (apply 'solar-time-string light)))))))
(defun solar-equinoxes/solstices (k year)
"Date of equinox/solstice K for YEAR.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,
Richard M. Stallman <=