From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 10 Aug 2006 04:31:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~1052
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38cdf40b3ccebb28c9d94dcd36b3457b87e16918;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f584383ec23..9d22cf958a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
 	* facemenu.el (facemenu-add-face): Pass frame to facemenu-active-faces.
 	(facemenu-set-face): Doc fix.
+	(facemenu-listed-faces): Doc fix.
 
 2006-08-09  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/man/ChangeLog b/man/ChangeLog
index df2d8536e0b..8d252755de6 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10  Richard Stallman  <rms@gnu.org>
+
+	* text.texi (Format Faces): Substantial rewrites to deal
+	with face merging.  Empty regions don't count.  Clarify
+	face property inheritance.
+
 2006-08-08  Romain Francoise  <romain@orebokech.com>
 
 	* dired.texi (Marks vs Flags): Fix typo reported by Ari Roponen