# HG changeset patch # User Glenn Morris # Date 1218398852 0 # Node ID 53c533b1ebb107db9bb3f4ccd230d87c0b2d4a89 # Parent c96e0ea166fc8870bd96fa2c24596f4cb1e43b2e (holiday-float): Doc fixes (sync from trunk 2008-04-29). diff -r c96e0ea166fc -r 53c533b1ebb1 lisp/calendar/holidays.el --- a/lisp/calendar/holidays.el Sun Aug 10 20:07:11 2008 +0000 +++ b/lisp/calendar/holidays.el Sun Aug 10 20:07:32 2008 +0000 @@ -332,15 +332,13 @@ (list (list (list month day y) string))))) (defun holiday-float (month dayname n string &optional day) - "Holiday on MONTH, DAYNAME (Nth occurrence) called STRING. -If the Nth DAYNAME in MONTH is visible, the value returned is the list -\(((MONTH DAY year) STRING)). - -If N<0, count backward from the end of MONTH. - -An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. - -Returns nil if it is not visible in the current calendar window." + "Holiday called STRING on the Nth DAYNAME after/before MONTH DAY. +DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on. +If N>0, use the Nth DAYNAME after MONTH DAY. +If N<0, use the Nth DAYNAME before MONTH DAY. +DAY defaults to 1 if N>0, and MONTH's last day otherwise. +If the holiday is visible in the calendar window, returns a +list (((month day year) STRING)). Otherwise returns nil." ;; This is messy because the holiday may be visible, while the date on which ;; it is based is not. For example, the first Monday after December 30 may be ;; visible when January is not. For large values of |n| the problem is more