[Emacs-diffs] Changes to emacs/man/calendar.texi

[Richard M . Stallman]

Index: emacs/man/calendar.texi
diff -c emacs/man/calendar.texi:1.32 emacs/man/calendar.texi:1.33
*** emacs/man/calendar.texi:1.32        Sat Mar 26 20:13:31 2005
--- emacs/man/calendar.texi     Mon Mar 28 21:30:06 2005
***************
*** 433,439 ****
  from the menu that appears.  Either way, this displays the holidays for
  that date, in the echo area if they fit there, otherwise in a separate
  window.  If the variable @code{view-calendar-holidays-initially} is
! address@hidden, holidays are displayed when the calendar is created.
  
  @kindex x @r{(Calendar mode)}
  @findex mark-calendar-holidays
--- 433,439 ----
  from the menu that appears.  Either way, this displays the holidays for
  that date, in the echo area if they fit there, otherwise in a separate
  window.  If the variable @code{view-calendar-holidays-initially} is
! address@hidden, creating the calendar displays holidays in this way.
  
  @kindex x @r{(Calendar mode)}
  @findex mark-calendar-holidays
***************
*** 449,457 ****
  subsequently become visible by scrolling.  To turn marking off and erase
  the current marks, type @kbd{u}, which also erases any diary marks
  (@pxref{Diary}).  If the variable @code{mark-holidays-in-calendar} is
! address@hidden, holidays are marked in the calendar when it is created
! (or recomputed).
! 
  
  @kindex a @r{(Calendar mode)}
  @findex list-calendar-holidays
--- 449,456 ----
  subsequently become visible by scrolling.  To turn marking off and erase
  the current marks, type @kbd{u}, which also erases any diary marks
  (@pxref{Diary}).  If the variable @code{mark-holidays-in-calendar} is
! address@hidden, creating or updating the calendar marks holidays
! automatically.
  
  @kindex a @r{(Calendar mode)}
  @findex list-calendar-holidays
***************
*** 1005,1017 ****
  that fall on that date.  If you specify a numeric argument with @kbd{d},
  it shows all the diary entries for that many successive days.  Thus,
  @kbd{2 d} displays all the entries for the selected date and for the
! following day.  If the variable @code{view-diary-entries-initially} is
! address@hidden, the diary entries for the current date are displayed
! when the calendar is created (provided the current date is visible).
  
    Another way to display the diary entries for a date is to click
  @kbd{Mouse-2} on the date, and then choose @kbd{Diary entries} from
! the menu that appears.
  
  @kindex m @r{(Calendar mode)}
  @findex mark-diary-entries
--- 1004,1017 ----
  that fall on that date.  If you specify a numeric argument with @kbd{d},
  it shows all the diary entries for that many successive days.  Thus,
  @kbd{2 d} displays all the entries for the selected date and for the
! following day.
  
    Another way to display the diary entries for a date is to click
  @kbd{Mouse-2} on the date, and then choose @kbd{Diary entries} from
! the menu that appears.  If the variable
! @code{view-diary-entries-initially} is address@hidden, creating the
! calendar also lists diary entries for the current date (provided the
! current date is visible).
  
  @kindex m @r{(Calendar mode)}
  @findex mark-diary-entries
***************
*** 1023,1032 ****
  diary-entry-marker, emacs-xtra}.  The command applies both to the
  currently visible months and to other months that subsequently become
  visible by scrolling.  To turn marking off and erase the current marks,
! type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}).  If
! the variable @code{mark-diary-entries-in-calendar} is address@hidden,
! diary dates are marked in the calendar when it is created (or
! recomputed).
  
  @kindex s @r{(Calendar mode)}
  @findex show-all-diary-entries
--- 1023,1032 ----
  diary-entry-marker, emacs-xtra}.  The command applies both to the
  currently visible months and to other months that subsequently become
  visible by scrolling.  To turn marking off and erase the current marks,
! type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}).
! If the variable @code{mark-diary-entries-in-calendar} is
! address@hidden, creating or updating the calendar marks diary dates
! automatically.
  
  @kindex s @r{(Calendar mode)}
  @findex show-all-diary-entries
***************
*** 1034,1047 ****
  the @kbd{s} command.
  
    Display of selected diary entries uses the selective display feature
! to hide entries that don't apply.
! 
!   The diary buffer as you see it is an illusion, so simply printing the
! buffer does not print what you see on your screen.  There is a special
! command to print hard copy of the diary buffer @emph{as it appears};
! this command is @kbd{M-x print-diary-entries}.  It sends the data
! directly to the printer.  You can customize it like @code{lpr-region}
! (@pxref{Hardcopy}).
  
  @findex diary
    The command @kbd{M-x diary} displays the diary entries for the current
--- 1034,1045 ----
  the @kbd{s} command.
  
    Display of selected diary entries uses the selective display feature
! to hide entries that don't apply.  The diary buffer as you see it is
! an illusion, so simply printing the buffer does not print what you see
! on your screen.  There is a special command to print hard copy of the
! diary buffer @emph{as it appears}; this command is @kbd{M-x
! print-diary-entries}.  It sends the data directly to the printer.  You
! can customize it like @code{lpr-region} (@pxref{Hardcopy}).
  
  @findex diary
    The command @kbd{M-x diary} displays the diary entries for the current