Mercurial > emacs
changeset 69351:86b7b0805645
(calendar-holidays): Doc fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 10 Mar 2006 08:04:11 +0000 |
| parents | d3742811a570 |
| children | 61d19d23dd13 |
| files | lisp/calendar/calendar.el |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/calendar.el Fri Mar 10 02:40:31 2006 +0000 +++ b/lisp/calendar/calendar.el Fri Mar 10 08:04:11 2006 +0000 @@ -1192,11 +1192,15 @@ `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.