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

diff --git a/lisp/faces.el b/lisp/faces.el
index 4de99e2fa15e137dfc380de1d2d5c477bb45837a..a532707fb7ee2ac9669189dd9980b53cef595678 100644 (file)
--- 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)