aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-10-04 13:26:55 -0400
committerGlenn Morris2011-10-04 13:26:55 -0400
commitbdfa5dd206b05feed0b9312470bda434e8c21974 (patch)
tree4cf3d2563496000d92e74f3ec605df5e1dd7044f
parent0e2070b5b6a48b3232cf664bc8c587a2440a7d6c (diff)
downloademacs-bdfa5dd206b05feed0b9312470bda434e8c21974.tar.gz
emacs-bdfa5dd206b05feed0b9312470bda434e8c21974.zip
* lisp/calendar/holidays.el (calendar-check-holidays): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/holidays.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8760d84f367..3f7ae8232a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-10-04 Glenn Morris <rgm@gnu.org>
2
3 * calendar/holidays.el (calendar-check-holidays): Doc fix.
4
12011-10-04 Martin Rudalics <rudalics@gmx.at> 52011-10-04 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (window--delete): New function. 7 * window.el (window--delete): New function.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 695f9b92712..3ba1078f62d 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -632,8 +632,9 @@ The optional LABEL is used to label the buffer created."
632;;;###diary-autoload 632;;;###diary-autoload
633(defun calendar-check-holidays (date) 633(defun calendar-check-holidays (date)
634 "Check the list of holidays for any that occur on DATE. 634 "Check the list of holidays for any that occur on DATE.
635The value returned is a list of strings of relevant holiday descriptions. 635DATE is a list (month day year). This function considers the
636The holidays are those in the list `calendar-holidays'." 636holidays from the list `calendar-holidays', and returns a list of
637strings describing those holidays that apply on DATE."
637 (let ((displayed-month (calendar-extract-month date)) 638 (let ((displayed-month (calendar-extract-month date))
638 (displayed-year (calendar-extract-year date)) 639 (displayed-year (calendar-extract-year date))
639 holiday-list) 640 holiday-list)