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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b0daf5b862eefe1a35ba57e9db2db79f07a8657..3421009108dde4d4f63070251dad418ecc171076 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/fontset.c b/src/fontset.c
index 8061a2b90abbd960bdae2abeff4d8c9be7088d6b..e1ba05ea3e86a085ed4e48b46d6f3cf36c5be56b 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -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));