aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-01-03 23:47:33 +0000
committerRichard M. Stallman2002-01-03 23:47:33 +0000
commit5860ba6e6c0b4f9d0aa953beeddc68f02a23c5a8 (patch)
treedeee53462d11d1d1e16228f21be7366c50c2bae1
parent5d67986c426099355914f3cdf06b16a47c9b8b04 (diff)
downloademacs-5860ba6e6c0b4f9d0aa953beeddc68f02a23c5a8.tar.gz
emacs-5860ba6e6c0b4f9d0aa953beeddc68f02a23c5a8.zip
(diary-block): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/calendar/diary-lib.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b97d56de84a..cb1664ba9c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12002-01-03 Richard M. Stallman <rms@gnu.org> 12002-01-03 Richard M. Stallman <rms@gnu.org>
2 2
3 * calendar/diary-lib.el (diary-block): Doc fix.
4
3 * custom.el (defcustom): Fix syntax of previous change. 5 * custom.el (defcustom): Fix syntax of previous change.
4 6
52002-01-03 Per Abrahamsen <abraham@dina.kvl.dk> 72002-01-03 Per Abrahamsen <abraham@dina.kvl.dk>
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 425a809fd5b..4472344370f 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1242,7 +1242,8 @@ all values."
1242 1242
1243(defun diary-block (m1 d1 y1 m2 d2 y2) 1243(defun diary-block (m1 d1 y1 m2 d2 y2)
1244 "Block diary entry. 1244 "Block diary entry.
1245Entry applies if date is between two dates. Order of the parameters is 1245Entry applies if date is between, or on one of, two dates.
1246The order of the parameters is
1246M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and 1247M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and
1247D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t." 1248D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t."
1248 (let ((date1 (calendar-absolute-from-gregorian 1249 (let ((date1 (calendar-absolute-from-gregorian