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 6331cc2dd8767ac76c35a6fd74b734839a8f50e1..61b3e8cd76d4abeb763ff7f1b6677e925ce24371 100644 (file)
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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 --git a/src/xdisp.c b/src/xdisp.c
index 584ebea49f2a3973ebbbfc44eb11995ec67e0f6a..4a093495f3758b86f9d1f80c80feedab0b574732 100644 (file)
--- 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)