diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-19 01:57:19 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-19 01:57:19 +0000 |
| commit | 71c0bdc598f564433b41cb6e33aeecf63312311d (patch) | |
| tree | 390d76d7d6585b5d6a564be0a567152d5d4db0ce /src/w32fns.c | |
| parent | cef4c0fbf39010e50b205e44c398a58e445bd87d (diff) | |
| download | emacs-71c0bdc598f564433b41cb6e33aeecf63312311d.tar.gz | |
* w32fns.c, xfns.c (Qfont_param): New var.
(syms_of_w32fns): Initialize it.
(x_default_font_parameter): Record explicit `font' into `font-parameter'.
* faces.el (face-set-after-frame-default): Re-apply explicit `font'
frame parameters after setting up the `default' face.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index c31ee5be04d..34897314567 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -206,6 +206,7 @@ Lisp_Object Qnone; Lisp_Object Qsuppress_icon; Lisp_Object Qundefined_color; Lisp_Object Qcancel_timer; +Lisp_Object Qfont_param; Lisp_Object Qhyper; Lisp_Object Qsuper; Lisp_Object Qmeta; @@ -4295,6 +4296,12 @@ x_default_font_parameter (f, parms) if (NILP (font)) error ("No suitable font was found"); } + else + { + /* Remember the explicit font parameter, so we can re-apply it after + we've applied the `default' face settings. */ + x_set_frame_parameters (f, Fcons (Fcons (Qfont_param, font), Qnil)); + } x_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING); } @@ -8891,6 +8898,7 @@ syms_of_w32fns () DEFSYM (Qctrl, "ctrl"); DEFSYM (Qcontrol, "control"); DEFSYM (Qshift, "shift"); + DEFSYM (Qfont_param, "font-parameter"); /* This is the end of symbol initialization. */ /* Text property `display' should be nonsticky by default. */ |