aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-12-17 17:38:37 +0200
committerEli Zaretskii2010-12-17 17:38:37 +0200
commit30d621a239c131219cade1d57742c5e852bcc4f9 (patch)
treeb05bf102ccc742526405d009eef8d4e61c016568 /src
parent3c505d3124b1510f4b904e570c6198e88ce59dc5 (diff)
downloademacs-30d621a239c131219cade1d57742c5e852bcc4f9.tar.gz
emacs-30d621a239c131219cade1d57742c5e852bcc4f9.zip
Fix change that fixed bug #7587.
xdisp.c (Fformat_mode_line): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e56c1da05d..f7022e4a350 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-12-17 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (Fformat_mode_line): Fix last change.
4
12010-12-16 Chong Yidong <cyd@stupidchicken.com> 52010-12-16 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic 7 * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic
diff --git a/src/xdisp.c b/src/xdisp.c
index 29a1f346b88..7308e163c7e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17928,7 +17928,7 @@ are the selected window and the window's buffer). */)
17928 : EQ (face, Qt) ? (EQ (window, selected_window) 17928 : EQ (face, Qt) ? (EQ (window, selected_window)
17929 ? MODE_LINE_FACE_ID : MODE_LINE_INACTIVE_FACE_ID) 17929 ? MODE_LINE_FACE_ID : MODE_LINE_INACTIVE_FACE_ID)
17930 : EQ (face, Qmode_line) ? MODE_LINE_FACE_ID 17930 : EQ (face, Qmode_line) ? MODE_LINE_FACE_ID
17931 : EQ (face, Qmode_line_inactive) ? MODE_LINE_FACE_ID 17931 : EQ (face, Qmode_line_inactive) ? MODE_LINE_INACTIVE_FACE_ID
17932 : EQ (face, Qheader_line) ? HEADER_LINE_FACE_ID 17932 : EQ (face, Qheader_line) ? HEADER_LINE_FACE_ID
17933 : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID 17933 : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
17934 : DEFAULT_FACE_ID; 17934 : DEFAULT_FACE_ID;