From: Glenn Morris <rgm@gnu.org>
Date: Mon, 9 Feb 2009 07:50:44 +0000 (+0000)
Subject: (Holidays, Displaying the Diary): Update for new marker defaults.
X-Git-Tag: emacs-pretest-23.0.91~327
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=160f11d3fbe815548cc369a5c44b4cbc7c3e7402;p=emacs.git

(Holidays, Displaying the Diary): Update for new marker defaults.
---

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 @@
+2009-02-09  Glenn Morris  <rgm@gnu.org>
+
+	* calendar.texi (Holidays, Displaying the Diary): Update for new marker
+	defaults.
+
 2009-02-07  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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.
 @vindex calendar-mark-holidays-flag
   To view the distribution of holidays for all the dates shown in the
 calendar, use the @kbd{x} command.  This displays the dates that are
-holidays in a different face (or places a @samp{*} after these dates, if
-a color display is not available, or if @code{font-lock-mode} is off).
+holidays in a different face.
 @iftex
 @inforef{Calendar Customizing, calendar-holiday-marker, emacs-xtra}.
 @end iftex
@@ -1095,8 +1094,7 @@ current date is visible).
 @vindex calendar-mark-diary-entries-flag
   To get a broader view of which days are mentioned in the diary, use
 the @kbd{m} command.  This displays the dates that have diary entries in
-a different face (or places a @samp{+} after these dates, if display
-with multiple faces is not available).
+a different face.
 @iftex
 @inforef{Calendar Customizing, diary-entry-marker, emacs-xtra}.
 @end iftex