diff lisp/faces.el @ 96079:efbaf6995245

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

--- a/lisp/faces.el	Thu Jun 19 00:43:34 2008 +0000
+++ b/lisp/faces.el	Thu Jun 19 01:57:19 2008 +0000
@@ -703,7 +703,7 @@
 	(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 @@
   ;; 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)