aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-09-14 00:21:03 -0700
committerGlenn Morris2010-09-14 00:21:03 -0700
commit08151ec5f16033ca6d1a0b4ed15c22eaff2ae822 (patch)
tree50cadaa8bcb83ed8feb2a2ab964e434a22d43c4c
parent92b99a01de828c4bf81b465f1b1b2e9e06b0d96d (diff)
downloademacs-08151ec5f16033ca6d1a0b4ed15c22eaff2ae822.tar.gz
emacs-08151ec5f16033ca6d1a0b4ed15c22eaff2ae822.zip
* lisp/calendar/appt.el (appt-check): Doc fix.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/calendar/appt.el7
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 103d6406629..66be118bf7e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,7 @@
5 (diary-include-other-diary-files): Append to diary-included-files. 5 (diary-include-other-diary-files): Append to diary-included-files.
6 * calendar/appt.el (appt-update-list): Also check the members of 6 * calendar/appt.el (appt-update-list): Also check the members of
7 diary-included-files. (Bug#6999) 7 diary-included-files. (Bug#6999)
8 (appt-check): Doc fix.
8 9
92010-09-12 David Reitter <david.reitter@gmail.com> 102010-09-12 David Reitter <david.reitter@gmail.com>
10 11
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 08184922e79..c850abc63cc 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -47,8 +47,9 @@
47;; package is activated. Additionally, the appointments list is 47;; package is activated. Additionally, the appointments list is
48;; recreated automatically at 12:01am for those who do not logout 48;; recreated automatically at 12:01am for those who do not logout
49;; every day or are programming late. It is also updated when the 49;; every day or are programming late. It is also updated when the
50;; `diary-file' is saved. Calling `appt-check' with an argument (or 50;; `diary-file' (or a file it includes) is saved. Calling
51;; re-enabling the package) forces a re-initialization at any time. 51;; `appt-check' with an argument (or re-enabling the package) forces a
52;; re-initialization at any time.
52;; 53;;
53;; In order to add or delete items from today's list, without 54;; In order to add or delete items from today's list, without
54;; changing the diary file, use `appt-add' and `appt-delete'. 55;; changing the diary file, use `appt-add' and `appt-delete'.
@@ -261,7 +262,7 @@ The variable `appt-audible' controls the audible reminder."
261 "Check for an appointment and update any reminder display. 262 "Check for an appointment and update any reminder display.
262If optional argument FORCE is non-nil, reparse the diary file for 263If optional argument FORCE is non-nil, reparse the diary file for
263appointments. Otherwise the diary file is only parsed once per day, 264appointments. Otherwise the diary file is only parsed once per day,
264and when saved. 265or when it (or a file it includes) is saved.
265 266
266Note: the time must be the first thing in the line in the diary 267Note: the time must be the first thing in the line in the diary
267for a warning to be issued. The format of the time can be either 268for a warning to be issued. The format of the time can be either