diff options
| author | Glenn Morris | 2006-02-27 09:19:11 +0000 |
|---|---|---|
| committer | Glenn Morris | 2006-02-27 09:19:11 +0000 |
| commit | edcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0 (patch) | |
| tree | 54c89645c8366b96f7db9f3d59c747b39997c059 | |
| parent | c61633baf2558a61446414bfd21889b1198bcbbd (diff) | |
| download | emacs-edcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0.tar.gz emacs-edcb7f6b1a976ddcb1d8f6fadb778c5ca28e9bc0.zip | |
(calendar-holidays): Doc fix.
| -rw-r--r-- | lisp/calendar/calendar.el | 13 |
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 | |||
| 1190 | of `general-holidays', `local-holidays' `christian-holidays', | 1190 | of `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, |
| 1193 | you can eliminate unwanted categories of holidays. The intention is | 1193 | you can eliminate unwanted categories of holidays. |
| 1194 | that (in the US) `local-holidays' be set in site-init.el and | 1194 | |
| 1195 | `other-holidays' be set by the user. | 1195 | Note that these variables are only used to initialize the default |
| 1196 | value of `calendar-holidays'. In other words, they only have an | ||
| 1197 | effect on the displayed holidays if set before the calendar is | ||
| 1198 | loaded. After the calendar has been loaded, you must customize | ||
| 1199 | `calendar-holidays' directly. | ||
| 1200 | |||
| 1201 | The intention is that (in the US) `local-holidays' be set in | ||
| 1202 | site-init.el and `other-holidays' be set by the user. | ||
| 1196 | 1203 | ||
| 1197 | Entries on the list are expressions that return (possibly empty) lists of | 1204 | Entries on the list are expressions that return (possibly empty) lists of |
| 1198 | items of the form ((month day year) string) of a holiday in the in the | 1205 | items of the form ((month day year) string) of a holiday in the in the |