From: Kenichi Handa <handa@m17n.org>
Date: Fri, 9 Jun 2006 02:16:05 +0000 (+0000)
Subject: (x_new_fontset2): If an ASCII font couldn't be loaded,
X-Git-Tag: emacs-pretest-23.0.90~8295^2~905
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=553b54ccb0a4eb3ecc2e286a1627376954f58ae4;p=emacs.git

(x_new_fontset2): If an ASCII font couldn't be loaded,
return Qnil.
---

diff --git a/src/xterm.c b/src/xterm.c
index 7407585ebf0..d5253e27906 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8200,6 +8200,8 @@ x_new_fontset2 (f, fontsetname)
     return Qnil;
 
   font = fontset_ascii_font (f, fontset);
+  if (! font)
+    return Qnil;
   xfont = font->font.font;
 
   if (FRAME_FONT (f) == xfont)