[Emacs-diffs] Changes to emacs/src/xfaces.c

[Kenichi Handa]

Index: emacs/src/xfaces.c
diff -u emacs/src/xfaces.c:1.345 emacs/src/xfaces.c:1.346
--- emacs/src/xfaces.c:1.345    Wed Apr 12 08:11:04 2006
+++ emacs/src/xfaces.c  Wed May 10 12:36:37 2006
@@ -7072,6 +7072,16 @@
   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);
+#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_WINDOW_SYSTEM */
   return 1;
 }