aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-10-12 11:53:30 +0000
committerGerd Moellmann2000-10-12 11:53:30 +0000
commitd861718a093d186e692e8ce962abc3630a77b4d3 (patch)
tree4bfb808712e8df2802e0ebdc450d60f6ec986045
parentd1a7bc9359e658af9b91cb0986876f33e7aac5db (diff)
downloademacs-d861718a093d186e692e8ce962abc3630a77b4d3.tar.gz
emacs-d861718a093d186e692e8ce962abc3630a77b4d3.zip
(diary-cyclic): Doc fix from Ed Reingold.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/diary-lib.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 596e25b5784..73d3c8d9b3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12000-10-12 Gerd Moellmann <gerd@gnu.org> 12000-10-12 Gerd Moellmann <gerd@gnu.org>
2 2
3 * calendar/diary-lib.el (diary-cyclic): Doc fix from Ed Reingold.
4
3 * progmodes/scheme.el (scheme-mode-map): Use lisp-mode-shared-map 5 * progmodes/scheme.el (scheme-mode-map): Use lisp-mode-shared-map
4 instead of shared-lisp-mode-map. 6 instead of shared-lisp-mode-map.
5 7
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 877858fe703..6439e575e49 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1349,8 +1349,9 @@ to be March 1 in non-leap years."
1349 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR. 1349 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR.
1350If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR. 1350If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR.
1351ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of 1351ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of
1352years since the MONTH DAY, YEAR and the %s will be replaced by the ordinal 1352repetitions since the MONTH DAY, YEAR and %s will be replaced by the
1353ending of that number (that is, `st', `nd', `rd' or `th', as appropriate." 1353ordinal ending of that number (that is, `st', `nd', `rd' or `th', as
1354appropriate."
1354 (let* ((d (if european-calendar-style 1355 (let* ((d (if european-calendar-style
1355 month 1356 month
1356 day)) 1357 day))