aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-04-05 21:23:43 +0000
committerGlenn Morris2008-04-05 21:23:43 +0000
commit97f35570ad6e237166be67a17b1b29b4f310c914 (patch)
tree8d8b8a09979efc195bb2aa8b3964fc6178038c48
parentafe9998d567026eaf54f64da781f732eb7caf427 (diff)
downloademacs-97f35570ad6e237166be67a17b1b29b4f310c914.tar.gz
emacs-97f35570ad6e237166be67a17b1b29b4f310c914.zip
(diary-sabbath-candles-minutes, diary-sabbath-candles): Move to cal-hebrew.
-rw-r--r--lisp/calendar/solar.el28
1 files changed, 0 insertions, 28 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index c88b4c6f765..3d10b21a291 100644
--- 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
149 :type 'number 149 :type 'number
150 :group 'calendar) 150 :group 'calendar)
151 151
152(defcustom diary-sabbath-candles-minutes 18
153 "Number of minutes before sunset for sabbath candle lighting."
154 :group 'diary
155 :type 'integer
156 :version "21.1")
157
158
159;;; End of user options. 152;;; End of user options.
160 153
161 154
@@ -883,27 +876,6 @@ Accurate to a few seconds."
883 (solar-setup)) 876 (solar-setup))
884 (solar-sunrise-sunset-string date)) 877 (solar-sunrise-sunset-string date))
885 878
886;; To be called from list-sexp-diary-entries, where DATE is bound.
887;;;###diary-autoload
888(defun diary-sabbath-candles (&optional mark)
889 "Local time of candle lighting diary entry--applies if date is a Friday.
890No diary entry if there is no sunset on that date.
891
892An optional parameter MARK specifies a face or single-character string to
893use when highlighting the day in the calendar."
894 (or (and calendar-latitude calendar-longitude calendar-time-zone)
895 (solar-setup))
896 (if (= (% (calendar-absolute-from-gregorian date) 7) 5) ; Friday
897 (let* ((sunset (cadr (solar-sunrise-sunset date)))
898 (light (if sunset
899 (cons (- (car sunset)
900 (/ diary-sabbath-candles-minutes 60.0))
901 (cdr sunset)))))
902 (if sunset
903 (cons mark
904 (format "%s Sabbath candle lighting"
905 (apply 'solar-time-string light)))))))
906
907;; From Meeus, 1991, page 167. 879;; From Meeus, 1991, page 167.
908(defconst solar-seasons-data 880(defconst solar-seasons-data
909 '((485 324.96 1934.136) 881 '((485 324.96 1934.136)