Mercurial > emacs

changeset 28237:2f636fd2f714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(check_lface_attrs) [GLYPH_DEBUG]: Fix syntax error. (lface_fully_specified_p): Don't check contents of LFACE_FONT_INDEX because that attribute is optional. (realize_x_face): Remove now unwarranted xassert.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 21 Mar 2000 16:12:22 +0000
parents ad471f641f39
children d2822c1e22af
files src/xfaces.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Tue Mar 21 15:35:06 2000 +0000
+++ b/src/xfaces.c	Tue Mar 21 16:12:22 2000 +0000
@@ -2711,8 +2711,8 @@
 	   || SYMBOLP (attrs[LFACE_STIPPLE_INDEX])
 	   || !NILP (Fbitmap_spec_p (attrs[LFACE_STIPPLE_INDEX])));
   xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX])
-	   || NILP (attr[LFACE_FONT_INDEX]));
-	   || STRINGP (attr[LFACE_FONT_INDEX]));
+	   || NILP (attrs[LFACE_FONT_INDEX])
+	   || STRINGP (attrs[LFACE_FONT_INDEX]));
 #endif
 }
 
@@ -2838,7 +2838,7 @@
   int i;
 
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
-    if (UNSPECIFIEDP (attrs[i]))
+    if (UNSPECIFIEDP (attrs[i]) && i != LFACE_FONT_INDEX)
       break;
 
   return i == LFACE_VECTOR_SIZE;
@@ -5935,7 +5935,6 @@
   if (!NILP (stipple))
     face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h);
 
-  xassert (face->fontset < 0);
   xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
   return face;
 #endif /* HAVE_WINDOW_SYSTEM */