comparison src/xfaces.c @ 6768:0b61d2b74e64

(frame_update_line_height): New function. (Fset_face_attribute_internal): Call that.

6767:8fbcee1c2059

   depend only on the height of the frame's font.
	  && bounds1->ascent == bounds2->ascent
	  && bounds1->descent == bounds2->descent);  */
}

/* Modify face TO by copying from FROM all properties which have
   nondefault settings.  */
static void 
merge_faces (from, to)
     struct face *from, *to;

    {
      XFontStruct *font = load_font (f, attr_value);
      if (face->font != f->display.x->font)
	unload_font (f, face->font);
      face->font = font;
    }
  else if (EQ (attr_name, intern ("foreground")))
    {
      unsigned long new_color = load_color (f, attr_value);
      unload_color (f, face->foreground);

6768:0b61d2b74e64

   depend only on the height of the frame's font.
	  && bounds1->ascent == bounds2->ascent
	  && bounds1->descent == bounds2->descent);  */
}

/* Update the line_height of frame F according to the biggest font in
   any face, and resize the frame if line_height changes.  */

void
frame_update_line_height (f)
     FRAME_PTR f;
{
  int i;
  int biggest = FONT_HEIGHT (f->display.x->font);

  for (i = 0; i < f->display.x->n_param_faces; i++)
    if (f->display.x->param_faces[i]->font != (XFontStruct *) FACE_DEFAULT)
      {
	int height = FONT_HEIGHT (f->display.x->param_faces[i]->font);
	if (height > biggest)
	  biggest = height;
      }

  if (biggest == f->display.x->line_height)
    return;

  f->display.x->line_height = biggest;
  x_set_window_size (f, 0, f->width, f->height);
}

/* Modify face TO by copying from FROM all properties which have
   nondefault settings.  */
static void 
merge_faces (from, to)
     struct face *from, *to;

    {
      XFontStruct *font = load_font (f, attr_value);
      if (face->font != f->display.x->font)
	unload_font (f, face->font);
      face->font = font;
      frame_update_line_height (f);
    }
  else if (EQ (attr_name, intern ("foreground")))
    {
      unsigned long new_color = load_color (f, attr_value);
      unload_color (f, face->foreground);