[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/solar.el,v |
Date: |
Sat, 05 Apr 2008 21:23:44 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/05 21:23:43
Index: solar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/solar.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- solar.el 4 Apr 2008 07:06:53 -0000 1.78
+++ solar.el 5 Apr 2008 21:23:43 -0000 1.79
@@ -149,13 +149,6 @@
:type 'number
:group 'calendar)
-(defcustom diary-sabbath-candles-minutes 18
- "Number of minutes before sunset for sabbath candle lighting."
- :group 'diary
- :type 'integer
- :version "21.1")
-
-
;;; End of user options.
@@ -883,27 +876,6 @@
(solar-setup))
(solar-sunrise-sunset-string date))
-;; To be called from list-sexp-diary-entries, where DATE is bound.
-;;;###diary-autoload
-(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."
- (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-sabbath-candles-minutes 60.0))
- (cdr sunset)))))
- (if sunset
- (cons mark
- (format "%s Sabbath candle lighting"
- (apply 'solar-time-string light)))))))
-
;; From Meeus, 1991, page 167.
(defconst solar-seasons-data
'((485 324.96 1934.136)