aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calendar/holidays.el16
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 3f008617ce1..e8acd014772 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -332,15 +332,13 @@ STRING)). Returns nil if it is not visible in the current calendar window."
332 (list (list (list month day y) string))))) 332 (list (list (list month day y) string)))))
333 333
334(defun holiday-float (month dayname n string &optional day) 334(defun holiday-float (month dayname n string &optional day)
335 "Holiday on MONTH, DAYNAME (Nth occurrence) called STRING. 335 "Holiday called STRING on the Nth DAYNAME after/before MONTH DAY.
336If the Nth DAYNAME in MONTH is visible, the value returned is the list 336DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on.
337\(((MONTH DAY year) STRING)). 337If N>0, use the Nth DAYNAME after MONTH DAY.
338 338If N<0, use the Nth DAYNAME before MONTH DAY.
339If N<0, count backward from the end of MONTH. 339DAY defaults to 1 if N>0, and MONTH's last day otherwise.
340 340If the holiday is visible in the calendar window, returns a
341An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. 341list (((month day year) STRING)). Otherwise returns nil."
342
343Returns nil if it is not visible in the current calendar window."
344;; This is messy because the holiday may be visible, while the date on which 342;; This is messy because the holiday may be visible, while the date on which
345;; it is based is not. For example, the first Monday after December 30 may be 343;; it is based is not. For example, the first Monday after December 30 may be
346;; visible when January is not. For large values of |n| the problem is more 344;; visible when January is not. For large values of |n| the problem is more