aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-09 00:11:39 -0700
committerGlenn Morris2012-04-09 00:11:39 -0700
commit0c2014a3c2d53030df49e9c0a51d217dcaeccc4e (patch)
tree84a735cdd33ec67cc7f3aa4060b8fbf676cb57f8
parente2627d2130d78c81da53fd390a6b99197bb72701 (diff)
downloademacs-0c2014a3c2d53030df49e9c0a51d217dcaeccc4e.tar.gz
emacs-0c2014a3c2d53030df49e9c0a51d217dcaeccc4e.zip
* lisp/calendar/holidays.el (calendar-check-holidays): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/holidays.el2
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 @@
12012-04-09 Glenn Morris <rgm@gnu.org>
2
3 * calendar/holidays.el (calendar-check-holidays): Doc fix.
4
12012-04-08 Eli Zaretskii <eliz@gnu.org> 52012-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.
635DATE is a list (month day year). This function considers the 635DATE is a list (month day year). This function considers the
636holidays from the list `calendar-holidays', and returns a list of 636holidays from the list `calendar-holidays', and returns a list of
637strings describing those holidays that apply on DATE." 637strings 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)