diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
-rw-r--r-- | doc/emacs/calendar.texi | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index dbb274360f..bec432f6f2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2011-05-06 Glenn Morris <[email protected]> + * calendar.texi (Appointments): Mention appt-warning-time-regexp. + * cal-xtra.texi (Fancy Diary Display): Mention diary comments. 2011-05-02 Lars Magne Ingebrigtsen <[email protected]> diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 757dc3b4ac..fabd38ecc1 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1489,11 +1489,15 @@ Monday @end example @vindex appt-message-warning-time +@vindex appt-warning-time-regexp @noindent Then on Mondays, you will be reminded at around 9:20am about your coffee break and at around 11:50am about lunch. The variable @code{appt-message-warning-time} specifies how many minutes (default 12) -in advance to warn you. +in advance to warn you. This is a default warning time. Each +appointment can specify a different warning time by adding a piece +matching @code{appt-warning-time-regexp} (see that variable's +documentation for details). You can write times in am/pm style (with @samp{12:00am} standing for midnight and @samp{12:00pm} standing for noon), or 24-hour |