From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Mar 2006 08:04:11 +0000 (+0000)
Subject: (calendar-holidays): Doc fix.
X-Git-Tag: emacs-pretest-22.0.90~3724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e678b91b703631bb43e3a6ce262d72d1106d956a;p=emacs.git

(calendar-holidays): Doc fix.
---

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 9516e02c5e1..734a9b27e1f 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1192,11 +1192,15 @@ of `general-holidays', `local-holidays' `christian-holidays',
 `oriental-holidays', or `solar-holidays' to nil in your .emacs file,
 you can eliminate unwanted categories of holidays.
 
-Note that these variables are only used to initialize the default
-value of `calendar-holidays'.  In other words, they only have an
-effect on the displayed holidays if set before the calendar is
-loaded.  After the calendar has been loaded, you must customize
-`calendar-holidays' directly.
+The aforementioned variables control the holiday choices offered
+by the function `list-holidays' when it is called interactively.
+
+They are also used to initialize the default value of
+`calendar-holidays', which is the default list of holidays used
+by the function `list-holidays' in the non-interactive case.
+Note that these variables have no effect on `calendar-holidays'
+after it has been set (e.g. after the calendar is loaded).  In
+that case, customize `calendar-holidays' directly.
 
 The intention is that (in the US) `local-holidays' be set in
 site-init.el and `other-holidays' be set by the user.