Mercurial > emacs
diff lisp/calendar/solar.el @ 93749:a67be3023573
(diary-sabbath-candles-minutes, diary-sabbath-candles): Move to cal-hebrew.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 05 Apr 2008 21:23:43 +0000 |
parents | 8a8d2922328b |
children | 047187066e1d |
line wrap: on
line diff
--- a/lisp/calendar/solar.el Sat Apr 05 21:15:20 2008 +0000 +++ b/lisp/calendar/solar.el Sat Apr 05 21:23:43 2008 +0000 @@ -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)