From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 24 Nov 2002 18:59:08 +0000 (+0000)
Subject: (face-set-after-frame-default): Ignore errors in face-spec-face-set.
X-Git-Tag: ttn-vms-21-2-B4~12288
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebfa5c375edc2ad19a0d3eab60d8ab8f2c682d61;p=emacs.git

(face-set-after-frame-default): Ignore errors in face-spec-face-set.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index f721ac0a7e8..028ea671bd7 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1669,15 +1669,17 @@ Value is the new frame created."
 (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.
   (dolist (face (face-list))
-    (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))))
-
+    (condition-case ()
+	(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)))
+      (error nil)))
   ;; Initialize attributes from frame parameters.
   (let ((params '((foreground-color default :foreground)
 		  (background-color default :background)