[Emacs-diffs] emacs/doc/emacs ChangeLog calendar.texi

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/02/09 07:50:44

Modified files:
        doc/emacs      : ChangeLog calendar.texi 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/ChangeLog?cvsroot=emacs&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/calendar.texi?cvsroot=emacs&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- ChangeLog   7 Feb 2009 16:52:26 -0000       1.278
+++ ChangeLog   9 Feb 2009 07:50:44 -0000       1.279
@@ -1,3 +1,8 @@
+2009-02-09  Glenn Morris  <address@hidden>
+
+       * calendar.texi (Holidays, Displaying the Diary): Update for new marker
+       defaults.
+
 2009-02-07  Eli Zaretskii  <address@hidden>
 
        * rmail.texi (Rmail Coding) <rmail-redecode-body>: Remove stale

Index: calendar.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/calendar.texi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- calendar.texi       8 Jan 2009 05:28:47 -0000       1.15
+++ calendar.texi       9 Feb 2009 07:50:44 -0000       1.16
@@ -488,8 +488,7 @@
 @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 @@
 @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