Mercurial > emacs
comparison src/xfaces.c @ 89948:e94e49dc760e
(Fface_font): Fix previous change.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 30 Jun 2004 04:20:06 +0000 |
parents | 62d04caf8fb9 |
children | ad8c5c667a14 |
comparison
equal
deleted
inserted
replaced
89947:62d04caf8fb9 | 89948:e94e49dc760e |
---|---|
4996 struct face *face = FACE_FROM_ID (f, face_id); | 4996 struct face *face = FACE_FROM_ID (f, face_id); |
4997 | 4997 |
4998 if (! face) | 4998 if (! face) |
4999 return Qnil; | 4999 return Qnil; |
5000 #ifdef HAVE_WINDOW_SYSTEM | 5000 #ifdef HAVE_WINDOW_SYSTEM |
5001 if (!NILP (character)) | 5001 if (FRAME_WINDOW_P (f) && !NILP (character)) |
5002 { | 5002 { |
5003 CHECK_CHARACTER (character); | 5003 CHECK_CHARACTER (character); |
5004 face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil); | 5004 face_id = FACE_FOR_CHAR (f, face, XINT (character), -1, Qnil); |
5005 face = FACE_FROM_ID (f, face_id); | 5005 face = FACE_FROM_ID (f, face_id); |
5006 return (face->font && face->font_name | 5006 return (face->font && face->font_name |