comparison src/xfaces.c @ 67056:3ce17ff4a61f

(merge_face_vectors): Don't do :ignore-defface overwriting here. (Finternal_merge_in_global_face): Do it here.

67055:c6ae377fa1f0

  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]);
	else if (IGNORE_DEFFACE_P (from[i]))
	  to[i] = Qunspecified;
	else
	  to[i] = from[i];
      }

  /* TO is always an absolute face, which should inherit from nothing.

  /* Set lface to the Lisp attribute vector of FACE.  */
  if (EQ (frame, Qt))
    {
      lface = lface_from_face_name (NULL, face, 1);
      if (UNSPECIFIEDP (value))
	value = Qignore_defface;
    }
  else
    {
      if (NILP (frame))
	frame = selected_frame;

     "global before local" priority.  */
  lvec = XVECTOR (local_lface)->contents;
  gvec = XVECTOR (global_lface)->contents;
  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (! UNSPECIFIEDP (gvec[i]))
      lvec[i] = gvec[i];

  return Qnil;
}

67056:3ce17ff4a61f

  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]);
	else
	  to[i] = from[i];
      }

  /* TO is always an absolute face, which should inherit from nothing.

  /* Set lface to the Lisp attribute vector of FACE.  */
  if (EQ (frame, Qt))
    {
      lface = lface_from_face_name (NULL, face, 1);

      /* When updating face-new-frame-defaults, we put :ignore-defface
	 where the caller wants `unspecified'.  This forces the frame
	 defaults to ignore the defface value.  Otherwise, the defface
	 will take effect, which is generally not what is intended.
	 The value of that attribute will be inherited from some other
	 face during face merging.  See internal_merge_in_global_face. */
      if (UNSPECIFIEDP (value))
      	value = Qignore_defface;
    }
  else
    {
      if (NILP (frame))
	frame = selected_frame;

     "global before local" priority.  */
  lvec = XVECTOR (local_lface)->contents;
  gvec = XVECTOR (global_lface)->contents;
  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (! UNSPECIFIEDP (gvec[i]))
      if (IGNORE_DEFFACE_P (gvec[i]))
	lvec[i] = Qunspecified;
      else
	lvec[i] = gvec[i];

  return Qnil;
}