xdisp.c (get_char_face_and_encoding): Add extra args to FACE_FOR_CHAR.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-260
This commit is contained in:
Miles Bader 2007-10-12 01:09:38 +00:00
parent d0f356c5ae
commit aa603a2acc
2 changed files with 6 additions and 1 deletions

View file

@ -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

View file

@ -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)