(diary-sabbath-candles-minutes, diary-sabbath-candles): Move to cal-hebrew.

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index c88b4c6f7657341e6bc8dca4a6ba088307ff000e..3d10b21a291ccfa193cfc1f6b3a322c230ec227c 100644 (file)
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -149,13 +149,6 @@ delta.  At present, delta = 0.01 degrees, so the value of the variable
   :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 @@ Accurate to a few seconds."
       (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)