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

[Jan Djärv]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.280 emacs/src/xfaces.c:1.281
*** emacs/src/xfaces.c:1.280    Thu Jun  5 18:52:43 2003
--- emacs/src/xfaces.c  Thu Jun 26 17:18:45 2003
***************
*** 4340,4345 ****
--- 4340,4346 ----
          xfree (font);
        }
  
+       f->default_face_done_p = 0;
        Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font_name), 
Qnil));
      }
  }
***************
*** 6586,6594 ****
        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);
      }
  #endif /* HAVE_WINDOW_SYSTEM */
  
--- 6587,6595 ----
        frame_font = Fassq (Qfont, f->param_alist);
        xassert (CONSP (frame_font) && STRINGP (XCDR (frame_font)));
        frame_font = XCDR (frame_font);
!       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 */