# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1164129769 0
# Node ID cd686b5380c4346d2605d0188a78c6f5354ca525
# Parent  3cc044eb98b78b5ecd6111f74f4af0d4e02e814c
(realize_default_face): Check if the default font name
exists on this display before trying to use it.

diff -r 3cc044eb98b7 -r cd686b5380c4 src/xfaces.c
--- a/src/xfaces.c	Tue Nov 21 16:11:30 2006 +0000
+++ b/src/xfaces.c	Tue Nov 21 17:22:49 2006 +0000
@@ -7071,10 +7071,18 @@
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
   if (face->font != FRAME_FONT (f))
-    /* As the font specified for the frame was not acceptable as a
-       font for the default face (perhaps because auto-scaled fonts
-       are rejected), we must adjust the frame font.  */
-    x_set_font (f, build_string (face->font_name), Qnil);
+    {
+      /* This can happen when making a frame on a display that does
+	 not support the default font.  */
+      if (!face->font)
+	return 0;
+
+      /* Otherwise, the font specified for the frame was not
+	 acceptable as a font for the default face (perhaps because
+	 auto-scaled fonts are rejected), so we must adjust the frame
+	 font.  */
+      x_set_font (f, build_string (face->font_name), Qnil);
+    }
 #endif	/* HAVE_X_WINDOWS */
 #endif	/* HAVE_WINDOW_SYSTEM */
   return 1;