Mercurial > emacs

changeset 98582:13af2a2ff3db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(face_for_char): If face->fontset is negative, just return ascii_face.
author Kenichi Handa <handa@m17n.org>
date Thu, 09 Oct 2008 12:18:40 +0000
parents bd9b20fa24a6
children 23b67e5f4932
files src/fontset.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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));