From: Jim Blandy <jimb@redhat.com>
Date: Sun, 18 Jul 1993 08:07:18 +0000 (+0000)
Subject: * xfns.c (Fx_create_frame): Block input around call to
X-Git-Tag: emacs-19.34~11701
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6817eab40505c7a9dc545eeba4b833b4868f4b41;p=emacs.git

* xfns.c (Fx_create_frame): Block input around call to
	x_new_font.  Test if the return value is a string, not if it's
	nil; x_new_font can return things besides nil and strings, to
	indicate error conditions.
---

diff --git a/src/xfns.c b/src/xfns.c
index 54dd80ee480..cc0464f8d1d 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1754,8 +1754,10 @@ be shared by the new frame.")
     Lisp_Object font;
 
     /* Try out a font which we know has bold and italic variations.  */
+    BLOCK_INPUT;
     font = x_new_font (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1");
-    if (NILP (font))
+    UNBLOCK_INPUT;
+    if (! STRINGP (font))
       font = build_string ("-*-fixed-*-*-*-*-*-120-*-*-c-*-iso8859-1");
     
     x_default_parameter (f, parms, Qfont, font,