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 | 27129af9d775855efb529d63d2d5c62af2699afe (patch) | |
| tree | 74e230d850decbf44a9c013e9d6fb30e45ff9b65 /lisp/faces.el | |
| parent | d26424c5eb84c4bd153a375052fdc96223e0c46e (diff) | |
| download | emacs-27129af9d775855efb529d63d2d5c62af2699afe.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 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 251bacc5610..643b50a1316 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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) |