# HG changeset patch # User Kenichi Handa # Date 1223554720 0 # Node ID 13af2a2ff3db146d8a6f49fb1a740575321611dd # Parent bd9b20fa24a649f9b98812e7f33e2c390ce875ed (face_for_char): If face->fontset is negative, just return ascii_face. diff -r bd9b20fa24a6 -r 13af2a2ff3db src/fontset.c --- a/src/fontset.c Thu Oct 09 12:12:33 2008 +0000 +++ b/src/fontset.c Thu Oct 09 12:18:40 2008 +0000 @@ -876,7 +876,11 @@ 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));