diff options
| author | Richard M. Stallman <rms@gnu.org> | 2002-07-22 15:30:24 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2002-07-22 15:30:24 +0000 |
| commit | 68a380ba0220f170e6e1a45a4cc093d4a4ce5951 (patch) | |
| tree | 5dc5546832749c50b55a034667677b9b42cbb107 /lisp/calendar | |
| parent | 85f948c59621f37e54f041fc80f8fd558f70fa2a (diff) | |
| download | emacs-68a380ba0220f170e6e1a45a4cc093d4a4ce5951.tar.gz | |
(diary-sabbath-candles): Add optional MARK
parameter, specifying what face or character to use in the
calendar display. These will now return (MARK . ENTRY).
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/solar.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index fc4c61859a2..d85c99c0b54 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -920,9 +920,12 @@ Accurate to a few seconds." :type 'integer :version "21.1") -(defun diary-sabbath-candles () +(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." +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,8 +935,9 @@ No diary entry if there is no sunset on that date." (/ diary-sabbath-candles-minutes 60.0)) (cdr sunset))))) (if sunset - (format "%s Sabbath candle lighting" - (apply 'solar-time-string light)))))) + (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. |