mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(face_for_char): If face->fontset is negative, just return ascii_face.

Browse source
This commit is contained in:
Kenichi Handa 2008-10-09 12:19:38 +00:00
parent c576d6dc9e
commit ea217c11e5
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2008-10-09 Kenichi Handa <handa@m17n.org>
* fontset.c (face_for_char): If face->fontset is negative, just
return ascii_face.
* font.c (font_delete_unmatched): Fix previous change. Don't
reject an entity if DPI and AVGWIDTH of an entity are 0.
2008-10-09 Martin Rudalics <rudalics@gmx.at>
* frame.c (Fraise_frame): On text-only terminals select frame in

6
src/fontset.c
View file

@ -876,7 +876,11 @@ face_for_char (f, face, c, pos, object)
int face_id;
int id;
if (ASCII_CHAR_P (c))
/* If face->fontset is negative (that happens when no font is found
for face), just return face->ascii_face because we can't do
anything. Perhaps, we should fix the callers to assure
that face->fontset is always valid. */
if (ASCII_CHAR_P (c) || face->fontset < 0)
return face->ascii_face->id;
xassert (fontset_id_valid_p (face->fontset));