* 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.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88debfeb812..90b9b297b55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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'.
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)