diff options
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index deba0289721..0697475ef3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | all-hebrew-calendar-holidays. | 53 | all-hebrew-calendar-holidays. |
| 54 | (hebrew-holidays, christian-holidays, islamic-holidays, bahai-holidays): | 54 | (hebrew-holidays, christian-holidays, islamic-holidays, bahai-holidays): |
| 55 | Simplify using new functions. | 55 | Simplify using new functions. |
| 56 | (calendar-holidays): Doc fix. | ||
| 56 | (generate-calendar-window): Use bound-and-true-p. | 57 | (generate-calendar-window): Use bound-and-true-p. |
| 57 | 58 | ||
| 58 | * calendar/diary-lib.el (diary-mail-addr): Use bound-and-true-p. | 59 | * 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 | |||
| 1058 | site-init.el and `other-holidays' be set by the user. | 1058 | site-init.el and `other-holidays' be set by the user. |
| 1059 | 1059 | ||
| 1060 | Entries on the list are expressions that return (possibly empty) lists of | 1060 | Entries on the list are expressions that return (possibly empty) lists of |
| 1061 | items of the form ((month day year) string) of a holiday in the in the | 1061 | items of the form ((month day year) string) of a holiday in the |
| 1062 | three-month period centered around `displayed-month' of `displayed-year'. | 1062 | three-month period centered around `displayed-month' of `displayed-year'. |
| 1063 | Several basic functions are provided for this purpose: | 1063 | Several basic functions are provided for this purpose: |
| 1064 | 1064 | ||
| @@ -1092,18 +1092,18 @@ To add the last day of Hanukkah to the list, use | |||
| 1092 | 1092 | ||
| 1093 | (holiday-hebrew 10 2 \"Last day of Hanukkah\") | 1093 | (holiday-hebrew 10 2 \"Last day of Hanukkah\") |
| 1094 | 1094 | ||
| 1095 | since the Hebrew months are numbered with 1 starting from Nisan, while to | 1095 | since the Hebrew months are numbered with 1 starting from Nisan. |
| 1096 | add the Islamic feast celebrating Mohammed's birthday use | 1096 | To add the Islamic feast celebrating Mohammed's birthday, use |
| 1097 | 1097 | ||
| 1098 | (holiday-islamic 3 12 \"Mohammed's Birthday\") | 1098 | (holiday-islamic 3 12 \"Mohammed's Birthday\") |
| 1099 | 1099 | ||
| 1100 | since the Islamic months are numbered from 1 starting with Muharram. To | 1100 | since the Islamic months are numbered from 1 starting with Muharram. |
| 1101 | add an entry for the Baha'i festival of Ridvan, use | 1101 | To add an entry for the Baha'i festival of Ridvan, use |
| 1102 | 1102 | ||
| 1103 | (holiday-bahai 2 13 \"Festival of Ridvan\") | 1103 | (holiday-bahai 2 13 \"Festival of Ridvan\") |
| 1104 | 1104 | ||
| 1105 | since the Baha'i months are numbered from 1 starting with Baha. To | 1105 | since the Baha'i months are numbered from 1 starting with Baha. |
| 1106 | add Thomas Jefferson's birthday, April 2, 1743 (Julian), use | 1106 | To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use |
| 1107 | 1107 | ||
| 1108 | (holiday-julian 4 2 \"Jefferson's Birthday\") | 1108 | (holiday-julian 4 2 \"Jefferson's Birthday\") |
| 1109 | 1109 | ||