aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-08-26 05:39:53 +0000
committerGlenn Morris2008-08-26 05:39:53 +0000
commit19b1a5bc072e4b9e04d00c6b4f3b393d10dfd04c (patch)
treed028d0f13eacb976cb82950efb6142e10f884c64
parent5cc67f65cdc96cb7ece883f8a724df2d6e0ef090 (diff)
downloademacs-19b1a5bc072e4b9e04d00c6b4f3b393d10dfd04c.tar.gz
emacs-19b1a5bc072e4b9e04d00c6b4f3b393d10dfd04c.zip
(calendar-holidays): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/holidays.el10
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 832871f7d1d..531876e2d8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
5 5
62008-08-26 Glenn Morris <rgm@gnu.org> 62008-08-26 Glenn Morris <rgm@gnu.org>
7 7
8 * calendar/holidays.el (calendar-holidays): Doc fix.
9
8 * progmodes/gud.el (tramp-file-name-localname) 10 * progmodes/gud.el (tramp-file-name-localname)
9 (tramp-dissect-file-name): Declare. 11 (tramp-dissect-file-name): Declare.
10 12
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 9e703df114f..f3ac3f06c96 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -355,11 +355,11 @@ three-month period centered around `displayed-month' of `displayed-year'.
355Several basic functions are provided for this purpose: 355Several basic functions are provided for this purpose:
356 356
357 (holiday-fixed MONTH DAY STRING) is a fixed date on the Gregorian calendar 357 (holiday-fixed MONTH DAY STRING) is a fixed date on the Gregorian calendar
358 (holiday-float MONTH DAYNAME K STRING &optional day) is the Kth DAYNAME in 358 (holiday-float MONTH DAYNAME K STRING &optional DAY) is the Kth DAYNAME
359 MONTH on the Gregorian calendar (0 for Sunday, 359 (0 for Sunday, etc.) after/before Gregorian
360 etc.); K<0 means count back from the end of the 360 MONTH DAY. K<0 means count back from the end
361 month. An optional parameter DAY means the Kth 361 of the month. Optional DAY defaults to 1 if
362 DAYNAME after/before MONTH DAY. 362 K>0, and MONTH's last day otherwise.
363 (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar 363 (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar
364 (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar 364 (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar
365 (holiday-bahai MONTH DAY STRING) a fixed date on the Baha'i calendar 365 (holiday-bahai MONTH DAY STRING) a fixed date on the Baha'i calendar