# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1053355566 0
# Node ID 8b14c07986ec179d5205a4380c9105865848309e
# Parent  315c1e04aa83bfcca53ac654a91f5564f6458b10
(x-create-frame-with-faces): Don't call face-set-after-frame-default.
(face-set-after-frame-default): Copy attrs of global `default'
face to FRAME's `default' face.

diff -r 315c1e04aa83 -r 8b14c07986ec lisp/faces.el
--- a/lisp/faces.el	Mon May 19 14:43:20 2003 +0000
+++ b/lisp/faces.el	Mon May 19 14:46:06 2003 +0000
@@ -1657,7 +1657,8 @@
 	(progn
 	  (x-handle-reverse-video frame parameters)
 	  (frame-set-background-mode frame)
-	  (face-set-after-frame-default frame)
+	  ;; No need to call `face-set-after-frame-default'
+	  ;; since x-create-frame does that.
 	  (if (or (null frame-list) (null visibility-spec))
 	      (make-frame-visible frame)
 	    (modify-frame-parameters frame (list visibility-spec)))
@@ -1670,8 +1671,21 @@
 (defun face-set-after-frame-default (frame)
   "Set frame-local faces of FRAME from face specs and resources.
 Initialize colors of certain faces from frame parameters."
-  ;; Don't let frame creation fail because of an invalid face spec.
+  (if (face-attribute 'default :font t)
+      (set-face-attribute 'default frame :font
+			  (face-attribute 'default :font t))
+    (set-face-attribute 'default frame :family
+			(face-attribute 'default :family t))
+    (set-face-attribute 'default frame :height
+			(face-attribute 'default :height t))
+    (set-face-attribute 'default frame :slant
+			(face-attribute 'default :slant t))
+    (set-face-attribute 'default frame :weight
+			(face-attribute 'default :weight t))
+    (set-face-attribute 'default frame :width
+			(face-attribute 'default :width t)))
   (dolist (face (face-list))
+    ;; Don't let frame creation fail because of an invalid face spec.
     (condition-case ()
 	(when (not (equal face 'default))
 	  (face-spec-set face (face-user-default-spec face) frame)