diff src/xfaces.c @ 51665:c1f65dfc56eb

Fix some of the font/face problems.
author Jan Dj?rv <jan.h.d@swipnet.se>
date Thu, 26 Jun 2003 21:18:45 +0000
parents 6b3fc894fe43
children b154b2a09262
line wrap: on
line diff
--- a/src/xfaces.c	Thu Jun 26 21:09:11 2003 +0000
+++ b/src/xfaces.c	Thu Jun 26 21:18:45 2003 +0000
@@ -4340,6 +4340,7 @@
 	  xfree (font);
 	}
 
+      f->default_face_done_p = 0;
       Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), Qnil));
     }
 }
@@ -6586,9 +6587,9 @@
       frame_font = Fassq (Qfont, f->param_alist);
       xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
       frame_font = XCDR (frame_font);
-      /* Specify 0 for FORCE_P here, so that we don't override
-	 a :family attribute specified for `default' for new frames.  */
-      set_lface_from_font_name (f, lface, frame_font, 0, 1);
+      set_lface_from_font_name (f, lface, frame_font,
+                                f->default_face_done_p, 1);
+      f->default_face_done_p = 1;
     }
 #endif /* HAVE_WINDOW_SYSTEM */