Commit 27129af9 authored by Stefan Monnier's avatar Stefan Monnier

* 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.
parent d26424c5
2008-06-19 Stefan Monnier <monnier@iro.umontreal.ca>
* faces.el (face-set-after-frame-default): Re-apply explicit `font'
frame parameters after setting up the `default' face.
2008-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
* faces.el (face-set-after-frame-default): Don't exclude `default'.
......
......@@ -703,7 +703,7 @@ like an underlying face would be, with higher priority than underlying faces."
(put (or (get face 'face-alias) face) 'face-modified t))
(while args
;; Don't recursively set the attributes from the frame's font param
;; when we update the frame's font param fro the attributes.
;; when we update the frame's font param from the attributes.
(let ((inhibit-face-set-after-frame-default t))
(if (and (eq (car args) :family)
(stringp (cadr args))
......@@ -2018,6 +2018,7 @@ Initialize colors of certain faces from frame parameters."
;; Find attributes that should be initialized from frame parameters.
(let ((face-params '((foreground-color default :foreground)
(background-color default :background)
(font-parameter default :font)
(border-color border :background)
(cursor-color cursor :background)
(scroll-bar-foreground scroll-bar :foreground)
......
2008-06-19 Stefan Monnier <monnier@iro.umontreal.ca>
* w32fns.c, xfns.c (Qfont_param): New var.
(syms_of_w32fns): Initialize it.
(x_default_font_parameter): Record explicit `font' into `font-parameter'.
2008-06-18 Kenichi Handa <handa@m17n.org>
* font.c (font_parse_xlfd): Fix previous change.
......@@ -24,9 +30,9 @@
2008-06-18 Jason Rumney <jasonr@gnu.org>
* w32font.c (w32font_list, w32font_match): Add logging.
* w32font.c (w32font_list, w32font_match): Add logging.
* w32uniscribe (uniscribe_list, uniscribe_match): Add logging.
* w32uniscribe (uniscribe_list, uniscribe_match): Add logging.
2008-06-17 Chong Yidong <cyd@stupidchicken.com>
......
......@@ -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. */
......
......@@ -204,6 +204,7 @@ Lisp_Object Qnone;
Lisp_Object Qsuppress_icon;
Lisp_Object Qundefined_color;
Lisp_Object Qcompound_text, Qcancel_timer;
static Lisp_Object Qfont_param;
/* In dispnew.c */
......@@ -3087,6 +3088,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);
}
......@@ -5854,6 +5861,8 @@ syms_of_xfns ()
staticpro (&Qcompound_text);
Qcancel_timer = intern ("cancel-timer");
staticpro (&Qcancel_timer);
Qfont_param = intern ("font-parameter");
staticpro (&Qfont_param);
/* This is the end of symbol initialization. */
/* Text property `display' should be nonsticky by default. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment