From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 1 Dec 2008 18:08:59 +0000 (+0000)
Subject: (realize_x_face): Make abort condition clearer.
X-Git-Tag: emacs-pretest-23.0.90~1382
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d78494f96281f4f27777b4920727aa7397a31613;p=emacs.git

(realize_x_face): Make abort condition clearer.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 873a7855168..a504ca1c9b1 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5886,9 +5886,12 @@ realize_x_face (cache, attrs)
 	 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]);