comparison src/xfaces.c @ 31221:5bd6bdf3d3cf

(merge_face_vectors): Clear TO's :font attribute if made inconsistent by a font-related attribute in FROM. (merge_face_inheritance): Add function comment.

31220:e947c5224fc0

     other code uses `unspecified' as a generic value for face attributes. */
  if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
      && !NILP (from[LFACE_INHERIT_INDEX]))
    merge_face_inheritance (f, from[LFACE_INHERIT_INDEX], to, cycle_check);

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
      else

      ? make_number (XFASTINT (check) + 1)				      \
      : Fcons (el, Qnil))						      \
   : Fmemq ((el), (check))						      \
   ? Qnil								      \
   : Fcons ((el), (check)))

static void
merge_face_inheritance (f, inherit, to, cycle_check)
     struct frame *f;
     Lisp_Object inherit;

31221:5bd6bdf3d3cf

     other code uses `unspecified' as a generic value for face attributes. */
  if (!UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])
      && !NILP (from[LFACE_INHERIT_INDEX]))
    merge_face_inheritance (f, from[LFACE_INHERIT_INDEX], to, cycle_check);

  /* If TO specifies a :font attribute, and FROM specifies some
     font-related attribute, we need to clear TO's :font attribute
     (because it will be inconsistent with whatever FROM specifies, and
     FROM takes precedence).  */
  if (!NILP (to[LFACE_FONT_INDEX])
      && (!UNSPECIFIEDP (from[LFACE_FAMILY_INDEX])
	  || !UNSPECIFIEDP (from[LFACE_HEIGHT_INDEX])
	  || !UNSPECIFIEDP (from[LFACE_WEIGHT_INDEX])
	  || !UNSPECIFIEDP (from[LFACE_SLANT_INDEX])
	  || !UNSPECIFIEDP (from[LFACE_SWIDTH_INDEX])))
    to[LFACE_FONT_INDEX] = Qnil;

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
      else

      ? make_number (XFASTINT (check) + 1)				      \
      : Fcons (el, Qnil))						      \
   : Fmemq ((el), (check))						      \
   ? Qnil								      \
   : Fcons ((el), (check)))


/* Merge face attributes from the face on frame F whose name is
   INHERITS, into the vector of face attributes TO; INHERITS may also be
   a list of face names, in which case they are applied in order.
   CYCLE_CHECK is used to detect loops in face inheritance.
   Returns true if any of the inherited attributes are `font-related'.  */

static void
merge_face_inheritance (f, inherit, to, cycle_check)
     struct frame *f;
     Lisp_Object inherit;