diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/holidays.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b25983104c..5934517a6d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/holidays.el (calendar-check-holidays): Doc fix. | ||
| 4 | |||
| 1 | 2012-04-08 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-04-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * textmodes/ispell.el (ispell-dictionary-base-alist): Add data for | 7 | * textmodes/ispell.el (ispell-dictionary-base-alist): Add data for |
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 37f511f7990..9edd353b889 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el | |||
| @@ -634,7 +634,7 @@ The optional LABEL is used to label the buffer created." | |||
| 634 | "Check the list of holidays for any that occur on DATE. | 634 | "Check the list of holidays for any that occur on DATE. |
| 635 | DATE is a list (month day year). This function considers the | 635 | DATE is a list (month day year). This function considers the |
| 636 | holidays from the list `calendar-holidays', and returns a list of | 636 | holidays from the list `calendar-holidays', and returns a list of |
| 637 | strings describing those holidays that apply on DATE." | 637 | strings describing those holidays that apply on DATE, or nil if none do." |
| 638 | (let ((displayed-month (calendar-extract-month date)) | 638 | (let ((displayed-month (calendar-extract-month date)) |
| 639 | (displayed-year (calendar-extract-year date)) | 639 | (displayed-year (calendar-extract-year date)) |
| 640 | holiday-list) | 640 | holiday-list) |