aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2011-05-06 00:14:30 -0700
committerGlenn Morris2011-05-06 00:14:30 -0700
commit5006e6344af9d8b870b32ba9cd228c2aab8fae32 (patch)
treeda353deaa9462a04f7f41d834fb64c0dda7fe240 /doc
parentb08a63ccec4bda5556777ab8538b92726fd55a1e (diff)
downloademacs-5006e6344af9d8b870b32ba9cd228c2aab8fae32.tar.gz
emacs-5006e6344af9d8b870b32ba9cd228c2aab8fae32.zip
Allow per-appointment warning times.
* lisp/calendar/appt.el (appt-message-warning-time): Doc fix. (appt-warning-time-regexp): New option. (appt-make-list): Respect appt-message-warning-time. * doc/emacs/calendar.texi (Appointments): Mention appt-warning-time-regexp. * etc/NEWS: Mention this.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/calendar.texi6
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index dbb274360fd..bec432f6f23 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
12011-05-06 Glenn Morris <rgm@gnu.org> 12011-05-06 Glenn Morris <rgm@gnu.org>
2 2
3 * calendar.texi (Appointments): Mention appt-warning-time-regexp.
4
3 * cal-xtra.texi (Fancy Diary Display): Mention diary comments. 5 * cal-xtra.texi (Fancy Diary Display): Mention diary comments.
4 6
52011-05-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 72011-05-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 757dc3b4ac7..fabd38ecc18 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1489,11 +1489,15 @@ Monday
1489@end example 1489@end example
1490 1490
1491@vindex appt-message-warning-time 1491@vindex appt-message-warning-time
1492@vindex appt-warning-time-regexp
1492@noindent 1493@noindent
1493Then on Mondays, you will be reminded at around 9:20am about your 1494Then on Mondays, you will be reminded at around 9:20am about your
1494coffee break and at around 11:50am about lunch. The variable 1495coffee break and at around 11:50am about lunch. The variable
1495@code{appt-message-warning-time} specifies how many minutes (default 12) 1496@code{appt-message-warning-time} specifies how many minutes (default 12)
1496in advance to warn you. 1497in advance to warn you. This is a default warning time. Each
1498appointment can specify a different warning time by adding a piece
1499matching @code{appt-warning-time-regexp} (see that variable's
1500documentation for details).
1497 1501
1498 You can write times in am/pm style (with @samp{12:00am} standing 1502 You can write times in am/pm style (with @samp{12:00am} standing
1499for midnight and @samp{12:00pm} standing for noon), or 24-hour 1503for midnight and @samp{12:00pm} standing for noon), or 24-hour