* 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 54dd80ee4803f4b5fe04f0c3b633197fb32d838b..cc0464f8d1df036c845e233dd6d723c3334a9efa 100644 (file)
--- 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,