summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2006-08-10 04:31:27 +0000
committerRichard M. Stallman <rms@gnu.org>2006-08-10 04:31:27 +0000
commit38cdf40b3ccebb28c9d94dcd36b3457b87e16918 (patch)
tree33a7cfa30fabe9b5fe61c5f94407d8efb0e76361
parentd7beaf538263b68d20df6eb01e693c31d27ea537 (diff)
downloademacs-38cdf40b3ccebb28c9d94dcd36b3457b87e16918.tar.gz
*** empty log message ***
-rw-r--r--lisp/ChangeLog1
-rw-r--r--man/ChangeLog6
2 files changed, 7 insertions, 0 deletions
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