comparison src/xfaces.c @ 28237:2f636fd2f714

(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.

28236:ad471f641f39

#ifdef HAVE_WINDOW_SYSTEM
  xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX])
	   || 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]));
#endif
}


/* Check consistency of attributes of Lisp face LFACE (a Lisp vector).  */

     Lisp_Object *attrs;
{
  int i;

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (UNSPECIFIEDP (attrs[i]))
      break;

  return i == LFACE_VECTOR_SIZE;
}

  stipple = attrs[LFACE_STIPPLE_INDEX];
  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 */
}

28237:2f636fd2f714

#ifdef HAVE_WINDOW_SYSTEM
  xassert (UNSPECIFIEDP (attrs[LFACE_STIPPLE_INDEX])
	   || SYMBOLP (attrs[LFACE_STIPPLE_INDEX])
	   || !NILP (Fbitmap_spec_p (attrs[LFACE_STIPPLE_INDEX])));
  xassert (UNSPECIFIEDP (attrs[LFACE_FONT_INDEX])
	   || NILP (attrs[LFACE_FONT_INDEX])
	   || STRINGP (attrs[LFACE_FONT_INDEX]));
#endif
}


/* Check consistency of attributes of Lisp face LFACE (a Lisp vector).  */

     Lisp_Object *attrs;
{
  int i;

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (UNSPECIFIEDP (attrs[i]) && i != LFACE_FONT_INDEX)
      break;

  return i == LFACE_VECTOR_SIZE;
}

  stipple = attrs[LFACE_STIPPLE_INDEX];
  if (!NILP (stipple))
    face->stipple = load_pixmap (f, stipple, &face->pixmap_w, &face->pixmap_h);

  xassert (FACE_SUITABLE_FOR_CHAR_P (face, c));
  return face;
#endif /* HAVE_WINDOW_SYSTEM */
}