From d2cafc8c0ab73480c69068fbfe5b3f69ab05ef17 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 21 Mar 2000 16:13:31 +0000 Subject: [PATCH] (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. --- src/ChangeLog | 7 +++++++ src/xfaces.c | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1f748139ff..b34ba37ca2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2000-03-21 Gerd Moellmann + + * xfaces.c (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. + 2000-03-21 Kenichi HANDA The following changes are to make font selection based on diff --git a/src/xfaces.c b/src/xfaces.c index c3c4360f3b..adfa1716c8 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -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 */ -- 2.20.1