[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100318: Fix change that fixed bug #7587.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100318
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-12-17 17:38:37 +0200
message:
  Fix change that fixed bug #7587.
  
   xdisp.c (Fformat_mode_line): Fix last change.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-16 02:13:28 +0000
+++ b/src/ChangeLog     2010-12-17 15:38:37 +0000
@@ -1,3 +1,7 @@
+2010-12-17  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (Fformat_mode_line): Fix last change.
+
 2010-12-16  Chong Yidong  <address@hidden>
 
        * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-12-16 02:13:28 +0000
+++ b/src/xdisp.c       2010-12-17 15:38:37 +0000
@@ -17928,7 +17928,7 @@
     : EQ (face, Qt) ? (EQ (window, selected_window)
                       ? MODE_LINE_FACE_ID : MODE_LINE_INACTIVE_FACE_ID)
     : EQ (face, Qmode_line) ? MODE_LINE_FACE_ID
-    : EQ (face, Qmode_line_inactive) ? MODE_LINE_FACE_ID
+    : EQ (face, Qmode_line_inactive) ? MODE_LINE_INACTIVE_FACE_ID
     : EQ (face, Qheader_line) ? HEADER_LINE_FACE_ID
     : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
     : DEFAULT_FACE_ID;