From: Glenn Morris Date: Fri, 10 Mar 2006 08:10:33 +0000 (+0000) Subject: (calendar-holidays): Make previous doc-fix less passive. X-Git-Tag: emacs-pretest-22.0.90~3719 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8775bef73be6f975fde0fc4099804f9bf72892b8;p=emacs.git (calendar-holidays): Make previous doc-fix less passive. --- diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 734a9b27e1f..1383b8bac16 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1195,12 +1195,12 @@ you can eliminate unwanted categories of holidays. 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. +They also 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.