More fallout from fixing bug #7587.

 src/xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
 the basic faces are supported.
 doc/lispref/modes.texi (Emulating Mode Line): Fix last change.
 etc/NEWS: Remove the entry about format-mode-line accepting only
 basic faces.

2 files changed, 12 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8574622c187..673f5f5bb99 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
+        the basic faces are supported.
+
 2010-12-24  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.c (x_check_fullscreen): Fix pixel/character mixup.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7308e163c7e..69a0fcfe3d8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17883,17 +17883,19 @@ DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
 First arg FORMAT specifies the mode line format (see `mode-line-format'
 for details) to use.
 
+By default, the format is evaluated for the currently selected window.
+
 Optional second arg FACE specifies the face property to put on all
 characters for which no face is specified.  The value nil means the
 default face.  The value t means whatever face the window's mode line
-currently uses \(either `mode-line' or `mode-line-inactive',
-depending).  An integer value means the value string has no text
-properties.  Otherwise, the value should be one of `default',
-`mode-line', `mode-line-inactive', `header-line', or `tool-bar'.
+currently uses (either `mode-line' or `mode-line-inactive',
+depending on whether the window is the selected window or not).
+An integer value means the value string has no text
+properties.
 
 Optional third and fourth args WINDOW and BUFFER specify the window
 and buffer to use as the context for the formatting (defaults
-are the selected window and the window's buffer).  */)
+are the selected window and the WINDOW's buffer).  */)
      (format, face, window, buffer)
      Lisp_Object format, face, window, buffer;
 {