diff options
| author | Glenn Morris | 2008-04-29 03:35:08 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-04-29 03:35:08 +0000 |
| commit | 5d595461b446f8f4b8ac05641976c3db2d273810 (patch) | |
| tree | 99380500201c8998151cee92c09d5e62db1f5bdf | |
| parent | a478b7bc2fb65ac2299d1972ccd9d50fef351569 (diff) | |
| download | emacs-5d595461b446f8f4b8ac05641976c3db2d273810.tar.gz emacs-5d595461b446f8f4b8ac05641976c3db2d273810.zip | |
(holiday-float): Doc fix.
| -rw-r--r-- | lisp/calendar/holidays.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 8a994c7e269..e945a146d30 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el | |||
| @@ -689,15 +689,13 @@ STRING)). Returns nil if it is not visible in the current calendar window." | |||
| 689 | (list (list (list month day y) string))))) | 689 | (list (list (list month day y) string))))) |
| 690 | 690 | ||
| 691 | (defun holiday-float (month dayname n string &optional day) | 691 | (defun holiday-float (month dayname n string &optional day) |
| 692 | "Holiday on MONTH, DAYNAME (Nth occurrence) called STRING. | 692 | "Holiday called STRING on the Nth DAYNAME after/before MONTH DAY. |
| 693 | If the Nth DAYNAME in MONTH is visible, the value returned is the list | 693 | DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on. |
| 694 | \(((MONTH DAY year) STRING)). | 694 | If N>0, use the Nth DAYNAME after MONTH DAY. |
| 695 | 695 | If N<0, use the Nth DAYNAME before MONTH DAY. | |
| 696 | If N<0, count backward from the end of MONTH. | 696 | DAY defaults to 1 if N>0, and MONTH's last day otherwise. |
| 697 | 697 | If the holiday is visible in the calendar window, returns a | |
| 698 | An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. | 698 | list (((month day year) STRING)). Otherwise returns nil." |
| 699 | |||
| 700 | Returns nil if it is not visible in the current calendar window." | ||
| 701 | ;; This is messy because the holiday may be visible, while the date | 699 | ;; This is messy because the holiday may be visible, while the date |
| 702 | ;; on which it is based is not. For example, the first Monday after | 700 | ;; on which it is based is not. For example, the first Monday after |
| 703 | ;; December 30 may be visible when January is not. For large values | 701 | ;; December 30 may be visible when January is not. For large values |