# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1192151378 0
# Node ID 762f55e106a25c5c577962cd202dc66ba12cf6c9
# Parent  3807f7a342ae1f08737871769e81c030deca809e
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 -r 3807f7a342ae -r 762f55e106a2 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Fri Oct 12 01:09:30 2007 +0000
+++ b/src/ChangeLog.unicode	Fri Oct 12 01:09:38 2007 +0000
@@ -1,3 +1,8 @@
+2007-10-11  Miles Bader  <miles@gnu.org>
+
+	* xdisp.c (get_char_face_and_encoding): Remove extraneous definition.
+	Add extra args to FACE_FOR_CHAR.
+
 2007-09-20  Kenichi Handa  <handa@m17n.org>
 
 	* keymap.c (where_is_internal_1): If key is a cons, store the copy
diff -r 3807f7a342ae -r 762f55e106a2 src/xdisp.c
--- a/src/xdisp.c	Fri Oct 12 01:09:30 2007 +0000
+++ b/src/xdisp.c	Fri Oct 12 01:09:38 2007 +0000
@@ -19562,7 +19562,7 @@
       /* 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)