changeset 100102:25295c680f6b

(realize_x_face): Make abort condition clearer.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 01 Dec 2008 18:08:59 +0000
parents 7ec75d3e4dc3
children c2ef1c8b2d64
files src/xfaces.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Mon Dec 01 18:08:53 2008 +0000
+++ b/src/xfaces.c	Mon Dec 01 18:08:59 2008 +0000
@@ -5886,9 +5886,12 @@
 	 realizing the default face, thus the default face should have
 	 already been realized.  */
       if (fontset == -1)
-	fontset = default_face->fontset;
-      if (fontset == -1)
-	abort ();
+	{
+	  if (default_face)
+	    fontset = default_face->fontset;
+	  if (fontset == -1)
+	    abort ();
+	}
       if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX]))
 	attrs[LFACE_FONT_INDEX]
 	  = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]);