From: Glenn Morris Date: Thu, 3 Apr 2008 04:41:55 +0000 (+0000) Subject: (calendar-holidays): Doc fix. X-Git-Tag: emacs-pretest-23.0.90~6642 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d613557fee8bdc8a01505ddf81173e7e3864427c;p=emacs.git (calendar-holidays): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index deba0289721..0697475ef3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -53,6 +53,7 @@ all-hebrew-calendar-holidays. (hebrew-holidays, christian-holidays, islamic-holidays, bahai-holidays): Simplify using new functions. + (calendar-holidays): Doc fix. (generate-calendar-window): Use bound-and-true-p. * calendar/diary-lib.el (diary-mail-addr): Use bound-and-true-p. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 06af60ce257..63c67a4545e 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1058,7 +1058,7 @@ The intention is that (in the US) `local-holidays' be set in site-init.el and `other-holidays' be set by the user. Entries on the list are expressions that return (possibly empty) lists of -items of the form ((month day year) string) of a holiday in the in the +items of the form ((month day year) string) of a holiday in the three-month period centered around `displayed-month' of `displayed-year'. Several basic functions are provided for this purpose: @@ -1092,18 +1092,18 @@ To add the last day of Hanukkah to the list, use (holiday-hebrew 10 2 \"Last day of Hanukkah\") -since the Hebrew months are numbered with 1 starting from Nisan, while to -add the Islamic feast celebrating Mohammed's birthday use +since the Hebrew months are numbered with 1 starting from Nisan. +To add the Islamic feast celebrating Mohammed's birthday, use (holiday-islamic 3 12 \"Mohammed's Birthday\") -since the Islamic months are numbered from 1 starting with Muharram. To -add an entry for the Baha'i festival of Ridvan, use +since the Islamic months are numbered from 1 starting with Muharram. +To add an entry for the Baha'i festival of Ridvan, use (holiday-bahai 2 13 \"Festival of Ridvan\") -since the Baha'i months are numbered from 1 starting with Baha. To -add Thomas Jefferson's birthday, April 2, 1743 (Julian), use +since the Baha'i months are numbered from 1 starting with Baha. +To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use (holiday-julian 4 2 \"Jefferson's Birthday\")