From: Glenn Morris Date: Mon, 9 Apr 2012 07:11:39 +0000 (-0700) Subject: * lisp/calendar/holidays.el (calendar-check-holidays): Doc fix. X-Git-Tag: emacs-24.0.96~111^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c2014a3c2d53030df49e9c0a51d217dcaeccc4e;p=emacs.git * lisp/calendar/holidays.el (calendar-check-holidays): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b25983104c..5934517a6d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-04-09 Glenn Morris + + * calendar/holidays.el (calendar-check-holidays): Doc fix. + 2012-04-08 Eli Zaretskii * 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." "Check the list of holidays for any that occur on DATE. DATE is a list (month day year). This function considers the holidays from the list `calendar-holidays', and returns a list of -strings describing those holidays that apply on DATE." +strings describing those holidays that apply on DATE, or nil if none do." (let ((displayed-month (calendar-extract-month date)) (displayed-year (calendar-extract-year date)) holiday-list)