aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2006-02-27 09:19:11 +0000
committerGlenn Morris2006-02-27 09:19:11 +0000
commitedcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0 (patch)
tree54c89645c8366b96f7db9f3d59c747b39997c059
parentc61633baf2558a61446414bfd21889b1198bcbbd (diff)
downloademacs-edcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0.tar.gz
emacs-edcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0.zip
(calendar-holidays): Doc fix.
-rw-r--r--lisp/calendar/calendar.el13
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index b48f63458dc..9516e02c5e1 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1190,9 +1190,16 @@ list `other-holidays' in your .emacs file. Similarly, by setting any
1190of `general-holidays', `local-holidays' `christian-holidays', 1190of `general-holidays', `local-holidays' `christian-holidays',
1191`hebrew-holidays', `islamic-holidays', `bahai-holidays', 1191`hebrew-holidays', `islamic-holidays', `bahai-holidays',
1192`oriental-holidays', or `solar-holidays' to nil in your .emacs file, 1192`oriental-holidays', or `solar-holidays' to nil in your .emacs file,
1193you can eliminate unwanted categories of holidays. The intention is 1193you can eliminate unwanted categories of holidays.
1194that (in the US) `local-holidays' be set in site-init.el and 1194
1195`other-holidays' be set by the user. 1195Note that these variables are only used to initialize the default
1196value of `calendar-holidays'. In other words, they only have an
1197effect on the displayed holidays if set before the calendar is
1198loaded. After the calendar has been loaded, you must customize
1199`calendar-holidays' directly.
1200
1201The intention is that (in the US) `local-holidays' be set in
1202site-init.el and `other-holidays' be set by the user.
1196 1203
1197Entries on the list are expressions that return (possibly empty) lists of 1204Entries on the list are expressions that return (possibly empty) lists of
1198items of the form ((month day year) string) of a holiday in the in the 1205items of the form ((month day year) string) of a holiday in the in the