comparison src/xfaces.c @ 90718:f1d13e615070

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 523-544) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 168-171) - Update from CVS - Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-150

90717:06937e972ad0

  face = realize_face (c, attrs, 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);
#endif	/* HAVE_X_WINDOWS */
#endif	/* HAVE_WINDOW_SYSTEM */
  return 1;
}

90718:f1d13e615070

  face = realize_face (c, attrs, DEFAULT_FACE_ID);

#ifdef HAVE_WINDOW_SYSTEM
#ifdef HAVE_X_WINDOWS
  if (face->font != FRAME_FONT (f))
    {
      /* This can happen when making a frame on a display that does
	 not support the default font.  */
      if (!face->font)
	return 0;

      /* Otherwise, the font specified for the frame was not
	 acceptable as a font for the default face (perhaps because
	 auto-scaled fonts are rejected), so we must adjust the frame
	 font.  */
      x_set_font (f, build_string (face->font_name), Qnil);
    }
#endif	/* HAVE_X_WINDOWS */
#endif	/* HAVE_WINDOW_SYSTEM */
  return 1;
}