comparison src/macterm.c @ 89709:688136a6cab5

(x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and OBJECT args.
author Kenichi Handa <handa@m17n.org>
date Thu, 15 Jan 2004 06:58:07 +0000
parents 375f2633d815
children 68c22ea6027c
comparison
equal deleted inserted replaced
89708:b66b529d5f33 89709:688136a6cab5
1647 face = FACE_FROM_ID (s->f, face_id); 1647 face = FACE_FROM_ID (s->f, face_id);
1648 if (face == NULL) 1648 if (face == NULL)
1649 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); 1649 face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
1650 1650
1651 if (s->first_glyph->type == CHAR_GLYPH) 1651 if (s->first_glyph->type == CHAR_GLYPH)
1652 face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch); 1652 face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch, -1, Qnil);
1653 else 1653 else
1654 face_id = FACE_FOR_CHAR (s->f, face, 0); 1654 face_id = FACE_FOR_CHAR (s->f, face, 0, -1, Qnil);
1655 s->face = FACE_FROM_ID (s->f, face_id); 1655 s->face = FACE_FROM_ID (s->f, face_id);
1656 PREPARE_FACE_FOR_DISPLAY (s->f, s->face); 1656 PREPARE_FACE_FOR_DISPLAY (s->f, s->face);
1657 1657
1658 /* If font in this face is same as S->font, use it. */ 1658 /* If font in this face is same as S->font, use it. */
1659 if (s->font == s->face->font) 1659 if (s->font == s->face->font)