aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-08-24 22:13:31 -0700
committerGlenn Morris2015-08-24 22:13:31 -0700
commit0db4992d2778a2da4dee8ca07cde8c5e206f5250 (patch)
treed1d245954fe20db4e63b6e99a74db41dba110c49
parent1229e61ab8fe7143fbe7d8a2686a6521627b77a2 (diff)
downloademacs-0db4992d2778a2da4dee8ca07cde8c5e206f5250.tar.gz
emacs-0db4992d2778a2da4dee8ca07cde8c5e206f5250.zip
* doc/emacs/cal-xtra.texi (Holiday Customizing): Fix typo in example.
* lisp/calendar/holidays.el (calendar-holidays): Fix doc typo.
-rw-r--r--doc/emacs/cal-xtra.texi6
-rw-r--r--lisp/calendar/holidays.el4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index f271be1d226..ed850456c8b 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -194,14 +194,14 @@ can do this as follows:
194 194
195 Many holidays occur on a specific day of the week, at a specific time 195 Many holidays occur on a specific day of the week, at a specific time
196of month. Here is a holiday form describing Hurricane Supplication Day, 196of month. Here is a holiday form describing Hurricane Supplication Day,
197celebrated in the Virgin Islands on the fourth Monday in August: 197celebrated in the Virgin Islands on the fourth Monday in July:
198 198
199@smallexample 199@smallexample
200(holiday-float 8 1 4 "Hurricane Supplication Day") 200(holiday-float 7 1 4 "Hurricane Supplication Day")
201@end smallexample 201@end smallexample
202 202
203@noindent 203@noindent
204Here the 8 specifies August, the 1 specifies Monday (Sunday is 0, 204Here the 7 specifies July, the 1 specifies Monday (Sunday is 0,
205Tuesday is 2, and so on), and the 4 specifies the fourth occurrence in 205Tuesday is 2, and so on), and the 4 specifies the fourth occurrence in
206the month (1 specifies the first occurrence, 2 the second occurrence, 206the month (1 specifies the first occurrence, 2 the second occurrence,
207@minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and 207@minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 6d7cea6b8c5..d282d74392a 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -267,9 +267,9 @@ For example, to add Bastille Day, celebrated in France on July 14, add
267 (holiday-fixed 7 14 \"Bastille Day\") 267 (holiday-fixed 7 14 \"Bastille Day\")
268 268
269to the list. To add Hurricane Supplication Day, celebrated in the Virgin 269to the list. To add Hurricane Supplication Day, celebrated in the Virgin
270Islands on the fourth Monday in August, add 270Islands on the fourth Monday in July, add
271 271
272 (holiday-float 8 1 4 \"Hurricane Supplication Day\") 272 (holiday-float 7 1 4 \"Hurricane Supplication Day\")
273 273
274to the list (the last Monday would be specified with `-1' instead of `4'). 274to the list (the last Monday would be specified with `-1' instead of `4').
275To add the last day of Hanukkah to the list, use 275To add the last day of Hanukkah to the list, use