Commit d2cafc8c authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(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.
parent c7ea3acc
No preview for this file type
......@@ -2711,8 +2711,8 @@ check_lface_attrs (attrs)
|| 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 @@ lface_fully_specified_p (attrs)
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 @@ realize_x_face (cache, attrs, c, base_face)
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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment