diff options
| author | Glenn Morris | 2009-02-09 07:50:44 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-02-09 07:50:44 +0000 |
| commit | 160f11d3fbe815548cc369a5c44b4cbc7c3e7402 (patch) | |
| tree | d30e2a6832908f58714aa634621dd1945b9e69fd | |
| parent | 7a603b73d64e1b603ba16e21db17da05fa17bf92 (diff) | |
| download | emacs-160f11d3fbe815548cc369a5c44b4cbc7c3e7402.tar.gz emacs-160f11d3fbe815548cc369a5c44b4cbc7c3e7402.zip | |
(Holidays, Displaying the Diary): Update for new marker defaults.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/calendar.texi | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index be30efa88c3..76eab8b54ea 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-02-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar.texi (Holidays, Displaying the Diary): Update for new marker | ||
| 4 | defaults. | ||
| 5 | |||
| 1 | 2009-02-07 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-02-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * rmail.texi (Rmail Coding) <rmail-redecode-body>: Remove stale | 8 | * rmail.texi (Rmail Coding) <rmail-redecode-body>: Remove stale |
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 61b6bd55325..77ee62acfd5 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi | |||
| @@ -488,8 +488,7 @@ window. | |||
| 488 | @vindex calendar-mark-holidays-flag | 488 | @vindex calendar-mark-holidays-flag |
| 489 | To view the distribution of holidays for all the dates shown in the | 489 | To view the distribution of holidays for all the dates shown in the |
| 490 | calendar, use the @kbd{x} command. This displays the dates that are | 490 | calendar, use the @kbd{x} command. This displays the dates that are |
| 491 | holidays in a different face (or places a @samp{*} after these dates, if | 491 | holidays in a different face. |
| 492 | a color display is not available, or if @code{font-lock-mode} is off). | ||
| 493 | @iftex | 492 | @iftex |
| 494 | @inforef{Calendar Customizing, calendar-holiday-marker, emacs-xtra}. | 493 | @inforef{Calendar Customizing, calendar-holiday-marker, emacs-xtra}. |
| 495 | @end iftex | 494 | @end iftex |
| @@ -1095,8 +1094,7 @@ current date is visible). | |||
| 1095 | @vindex calendar-mark-diary-entries-flag | 1094 | @vindex calendar-mark-diary-entries-flag |
| 1096 | To get a broader view of which days are mentioned in the diary, use | 1095 | To get a broader view of which days are mentioned in the diary, use |
| 1097 | the @kbd{m} command. This displays the dates that have diary entries in | 1096 | the @kbd{m} command. This displays the dates that have diary entries in |
| 1098 | a different face (or places a @samp{+} after these dates, if display | 1097 | a different face. |
| 1099 | with multiple faces is not available). | ||
| 1100 | @iftex | 1098 | @iftex |
| 1101 | @inforef{Calendar Customizing, diary-entry-marker, emacs-xtra}. | 1099 | @inforef{Calendar Customizing, diary-entry-marker, emacs-xtra}. |
| 1102 | @end iftex | 1100 | @end iftex |