comparison src/xfaces.c @ 70795:1d1c6a83c277

(best_matching_font): Fix crash in 2006-05-17 change.

70794:6f2bfdfe1af7

    *needs_overstrike = 0;

  best = NULL;

  /* Find the best match among the non-scalable fonts.  */
  for (i = 1; i < nfonts; ++i)
    if (!font_scalable_p (fonts + i)
	&& better_font_p (specified, fonts + i, best, 1, avgwidth))
      {
	best = fonts + i;

  check_lface (lface);
  bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs);
  face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);

#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_X_WINDOWS  
  if (face->font != FRAME_FONT (f))
    /* As the font specified for the frame was not acceptable as a
       font for the default face (perhaps because auto-scaled fonts
       are rejected), we must adjust the frame font.  */
    x_set_font (f, build_string (face->font_name), Qnil);

70795:1d1c6a83c277

    *needs_overstrike = 0;

  best = NULL;

  /* Find the best match among the non-scalable fonts.  */
  for (i = 0; i < nfonts; ++i)
    if (!font_scalable_p (fonts + i)
	&& better_font_p (specified, fonts + i, best, 1, avgwidth))
      {
	best = fonts + i;

  check_lface (lface);
  bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs);
  face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID);

#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_X_WINDOWS
  if (face->font != FRAME_FONT (f))
    /* As the font specified for the frame was not acceptable as a
       font for the default face (perhaps because auto-scaled fonts
       are rejected), we must adjust the frame font.  */
    x_set_font (f, build_string (face->font_name), Qnil);