Commit a20cba2c authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

Minor fixes to previous change.

parent 10787f7a
...@@ -433,7 +433,7 @@ click on that date with @kbd{Mouse-2} and then choose @kbd{Holidays} ...@@ -433,7 +433,7 @@ click on that date with @kbd{Mouse-2} and then choose @kbd{Holidays}
from the menu that appears. Either way, this displays the holidays for 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 that date, in the echo area if they fit there, otherwise in a separate
window. If the variable @code{view-calendar-holidays-initially} is window. If the variable @code{view-calendar-holidays-initially} is
non-@code{nil}, holidays are displayed when the calendar is created. non-@code{nil}, creating the calendar displays holidays in this way.
@kindex x @r{(Calendar mode)} @kindex x @r{(Calendar mode)}
@findex mark-calendar-holidays @findex mark-calendar-holidays
...@@ -449,9 +449,8 @@ both to the currently visible months and to other months that ...@@ -449,9 +449,8 @@ both to the currently visible months and to other months that
subsequently become visible by scrolling. To turn marking off and erase subsequently become visible by scrolling. To turn marking off and erase
the current marks, type @kbd{u}, which also erases any diary marks the current marks, type @kbd{u}, which also erases any diary marks
(@pxref{Diary}). If the variable @code{mark-holidays-in-calendar} is (@pxref{Diary}). If the variable @code{mark-holidays-in-calendar} is
non-@code{nil}, holidays are marked in the calendar when it is created non-@code{nil}, creating or updating the calendar marks holidays
(or recomputed). automatically.
@kindex a @r{(Calendar mode)} @kindex a @r{(Calendar mode)}
@findex list-calendar-holidays @findex list-calendar-holidays
...@@ -1005,13 +1004,14 @@ of the new window shows the date of the diary entries and any holidays ...@@ -1005,13 +1004,14 @@ of the new window shows the date of the diary entries and any holidays
that fall on that date. If you specify a numeric argument with @kbd{d}, 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, 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 @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 following day.
non-@code{nil}, 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 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 @kbd{Mouse-2} on the date, and then choose @kbd{Diary entries} from
the menu that appears. the menu that appears. If the variable
@code{view-diary-entries-initially} is non-@code{nil}, creating the
calendar also lists diary entries for the current date (provided the
current date is visible).
@kindex m @r{(Calendar mode)} @kindex m @r{(Calendar mode)}
@findex mark-diary-entries @findex mark-diary-entries
...@@ -1023,10 +1023,10 @@ with multiple faces is not available). @inforef{Calendar Customizing, ...@@ -1023,10 +1023,10 @@ with multiple faces is not available). @inforef{Calendar Customizing,
diary-entry-marker, emacs-xtra}. The command applies both to the diary-entry-marker, emacs-xtra}. The command applies both to the
currently visible months and to other months that subsequently become currently visible months and to other months that subsequently become
visible by scrolling. To turn marking off and erase the current marks, visible by scrolling. To turn marking off and erase the current marks,
type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}). If type @kbd{u}, which also turns off holiday marks (@pxref{Holidays}).
the variable @code{mark-diary-entries-in-calendar} is non-@code{nil}, If the variable @code{mark-diary-entries-in-calendar} is
diary dates are marked in the calendar when it is created (or non-@code{nil}, creating or updating the calendar marks diary dates
recomputed). automatically.
@kindex s @r{(Calendar mode)} @kindex s @r{(Calendar mode)}
@findex show-all-diary-entries @findex show-all-diary-entries
...@@ -1034,14 +1034,12 @@ recomputed). ...@@ -1034,14 +1034,12 @@ recomputed).
the @kbd{s} command. the @kbd{s} command.
Display of selected diary entries uses the selective display feature Display of selected diary entries uses the selective display feature
to hide entries that don't apply. 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
The diary buffer as you see it is an illusion, so simply printing the on your screen. There is a special command to print hard copy of the
buffer does not print what you see on your screen. There is a special diary buffer @emph{as it appears}; this command is @kbd{M-x
command to print hard copy of the diary buffer @emph{as it appears}; print-diary-entries}. It sends the data directly to the printer. You
this command is @kbd{M-x print-diary-entries}. It sends the data can customize it like @code{lpr-region} (@pxref{Hardcopy}).
directly to the printer. You can customize it like @code{lpr-region}
(@pxref{Hardcopy}).
@findex diary @findex diary
The command @kbd{M-x diary} displays the diary entries for the current The command @kbd{M-x diary} displays the diary entries for the current
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment