From: Miles Bader Date: Fri, 12 Oct 2007 01:09:38 +0000 (+0000) Subject: xdisp.c (get_char_face_and_encoding): Add extra args to FACE_FOR_CHAR. X-Git-Tag: emacs-pretest-23.0.90~8295^2~317 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa603a2acc70f6b044783a6d6dc018647ab7db4f;p=emacs.git xdisp.c (get_char_face_and_encoding): Add extra args to FACE_FOR_CHAR. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-260 --- diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index 6331cc2dd87..61b3e8cd76d 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode @@ -1,3 +1,8 @@ +2007-10-11 Miles Bader + + * xdisp.c (get_char_face_and_encoding): Remove extraneous definition. + Add extra args to FACE_FOR_CHAR. + 2007-09-20 Kenichi Handa * keymap.c (where_is_internal_1): If key is a cons, store the copy diff --git a/src/xdisp.c b/src/xdisp.c index 584ebea49f2..4a093495f37 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -19562,7 +19562,7 @@ get_char_face_and_encoding (f, c, face_id, char2b, multibyte_p, display_p) /* Unibyte case. We don't have to encode, but we have to make sure to use a face suitable for unibyte. */ STORE_XCHAR2B (char2b, 0, c); - face_id = FACE_FOR_CHAR (f, face, c); + face_id = FACE_FOR_CHAR (f, face, c, -1, Qnil); face = FACE_FROM_ID (f, face_id); } else if (c < 128)