# HG changeset patch # User Eli Zaretskii # Date 1292600317 -7200 # Node ID 7e12126392f2f579a12d054444962a9ee7c4836b # Parent bc7bbc0dbad44bd82c20962a2ad2ad8b9be55466 Fix change that fixed bug #7587. xdisp.c (Fformat_mode_line): Fix last change. diff -r bc7bbc0dbad4 -r 7e12126392f2 src/ChangeLog --- a/src/ChangeLog Fri Dec 17 19:38:22 2010 +0800 +++ b/src/ChangeLog Fri Dec 17 17:38:37 2010 +0200 @@ -1,3 +1,7 @@ +2010-12-17 Eli Zaretskii + + * xdisp.c (Fformat_mode_line): Fix last change. + 2010-12-16 Chong Yidong * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic diff -r bc7bbc0dbad4 -r 7e12126392f2 src/xdisp.c --- a/src/xdisp.c Fri Dec 17 19:38:22 2010 +0800 +++ b/src/xdisp.c Fri Dec 17 17:38:37 2010 +0200 @@ -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;