From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 31 May 2002 17:27:41 +0000 (+0000)
Subject: (face-set-after-frame-default): Don't change `default' face.
X-Git-Tag: emacs-pretest-21.2.91~245
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb3af7db6796f171ed1e75f9dd4a8dbbde0807ba;p=emacs.git

(face-set-after-frame-default): Don't change `default' face.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 4de99e2fa15..a532707fb7e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1518,17 +1518,17 @@ Value is the new frame created."
 	(delete-frame frame)))
     frame))
 
-
 (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."
   (dolist (face (face-list))
-    (face-spec-set face (face-user-default-spec face) frame)
-    (internal-merge-in-global-face face frame)
-    (when (and (memq window-system '(x w32 mac))
-	       (or (not (boundp 'inhibit-default-face-x-resources))
-		   (not (eq face 'default))))
-      (make-face-x-resource-internal face frame)))
+    (when (not (equal face 'default))
+      (face-spec-set face (face-user-default-spec face) frame)
+      (internal-merge-in-global-face face frame)
+      (when (and (memq window-system '(x w32 mac))
+		 (or (not (boundp 'inhibit-default-face-x-resources))
+		     (not (eq face 'default))))
+	(make-face-x-resource-internal face frame))))
 
   ;; Initialize attributes from frame parameters.
   (let ((params '((foreground-color default :foreground)
@@ -1548,7 +1548,6 @@ Initialize colors of certain faces from frame parameters."
 		   (eq (face-attribute face attr t) 'unspecified))
 	  (set-face-attribute face frame attr frame-param))))))
 
-
 (defun tty-handle-reverse-video (frame parameters)
   "Handle the reverse-video frame parameter for terminal frames."
   (when (cdr (or (assq 'reverse parameters)