* w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'

for explicit `font' parameters.
* frame.c (x_set_font): Remove unexplained call to fix inf-recursion.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/frame.c b/src/frame.c
index 761e6cc9a77..6320d0ca1ff 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3400,7 +3400,13 @@ x_set_font (f, arg, oldval)
   if (FRAME_FACE_CACHE (f))
     {
       XSETFRAME (frame, f);
-      call1 (Qface_set_after_frame_default, frame);
+      /* We used to call face-set-after-frame-default here, but it leads to
+         recursive calls (since that function can set the `default' face's
+         font which in turns changes the frame's `font' parameter).
+         Also I don't know what this call is meant to do, but it seems the
+         wrong way to do it anyway (it does a lot more work than what seems
+         reasonable in response to a change to `font').  */
+      /* call1 (Qface_set_after_frame_default, frame); */
     }
 }