From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 29 Jul 2006 01:57:38 +0000 (+0000)
Subject: (lookup_named_face, Fdisplay_supports_face_attributes_p):
X-Git-Tag: emacs-pretest-22.0.90~1202
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=418ca4d22a6bb3aa5bd4584f21ed4c7da12e0b80;p=emacs.git

(lookup_named_face, Fdisplay_supports_face_attributes_p):
Add conditional aborts for clarity.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index f67ea61b37a..99355cca6af 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5717,6 +5717,8 @@ lookup_named_face (f, symbol, c, signal_p)
       if (!realize_basic_faces (f))
 	return -1;
       default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+      if (default_face == NULL)
+	abort ();  /* realize_basic_faces must have set it up  */
     }
 
   if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
@@ -6221,6 +6223,8 @@ face for italic.  */)
       if (! realize_basic_faces (f))
 	error ("Cannot realize default face");
       def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+      if (def_face == NULL)
+	abort ();  /* realize_basic_faces must have set it up  */
     }
 
   /* Dispatch to the appropriate handler.  */