*** empty log message ***

[bpt/emacs.git] / lispref / calendar.texi

diff --git a/lispref/calendar.texi b/lispref/calendar.texi
index 171f6a2..4b60a19 100644 (file)
--- a/lispref/calendar.texi
+++ b/lispref/calendar.texi
@@ -30,7 +30,7 @@ diary suit your personal tastes.
 @code{t}, calling up the calendar automatically displays the diary
 entries for the current date as well.  The diary dates appear only if
 the current date is visible.  If you add both of the following lines to
-your @file{.emacs} file:@refill
+your init file:@refill
 
 @example
 (setq view-diary-entries-initially t)
@@ -52,8 +52,7 @@ window.
 @code{t} in order to mark any dates with diary entries.  This takes
 effect whenever the calendar window contents are recomputed.  There are
 two ways of marking these dates: by changing the face (@pxref{Faces}),
-if the display supports that, or by placing a plus sign (@samp{+})
-beside the date otherwise.
+or by placing a plus sign (@samp{+}) beside the date.
 
 @vindex mark-holidays-in-calendar
   Similarly, setting the variable @code{mark-holidays-in-calendar} to
@@ -68,8 +67,7 @@ the date, or a face name to use for displaying the date.  Likewise, the
 variable @code{diary-entry-marker} specifies how to mark a date that has
 diary entries.  The calendar creates faces named @code{holiday-face} and
 @code{diary-face} for these purposes; those symbols are the default
-values of these variables, when Emacs supports multiple faces on your
-terminal.
+values of these variables.
 
 @vindex calendar-load-hook
   The variable @code{calendar-load-hook} is a normal hook run when the
@@ -109,14 +107,17 @@ The variable @code{calendar-today-marker} specifies how to mark today's
 date.  Its value should be a character to insert next to the date or a
 face name to use for displaying the date.  A face named
 @code{calendar-today-face} is provided for this purpose; that symbol is
-the default for this variable when Emacs supports multiple faces on your
-terminal.
+the default for this variable.
 
 @vindex today-invisible-calendar-hook
 @noindent
   A similar normal hook, @code{today-invisible-calendar-hook} is run if
 the current date is @emph{not} visible in the window.
 
+@vindex calendar-move-hook
+  Starting in Emacs 21, each of the calendar cursor motion commands
+runs the hook @code{calendar-move-hook} after it moves the cursor.
+
 @node Holiday Customizing
 @section Customizing the Holidays
 
@@ -653,8 +654,8 @@ the entries by the dates they apply to.
 
   As with simple diary display, you can print a hard copy of the buffer
 with @code{print-diary-entries}.  To print a hard copy of a day-by-day
-diary for a week by positioning point on Sunday of that week, type
-@kbd{7 d} and then do @kbd{M-x print-diary-entries}.  As usual, the
+diary for a week, position point on Sunday of that week, type
+@kbd{7 d}, and then do @kbd{M-x print-diary-entries}.  As usual, the
 inclusion of the holidays slows down the display slightly; you can speed
 things up by setting the variable @code{holidays-in-diary-buffer} to
 @code{nil}.
@@ -776,7 +777,7 @@ can use
 @noindent
 and the fancy diary will show
 @smallexample
-Ruth & Ed's anniversary
+Ed's anniversary
 @end smallexample
 @noindent
 both on December 15 and on December 22.