]> code.delx.au - gnu-emacs/commitdiff
(realize_x_face): Make abort condition clearer.
authorChong Yidong <cyd@stupidchicken.com>
Mon, 1 Dec 2008 18:08:59 +0000 (18:08 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 1 Dec 2008 18:08:59 +0000 (18:08 +0000)
src/xfaces.c

index 873a785516886181aac2b3cc6d0cd370f8b35ac8..a504ca1c9b1431669eb88fa788ef701eed2fea46 100644 (file)
@@ -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]);