From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 1 Nov 2005 07:19:07 +0000 (+0000)
Subject: (face-attribute): Handle the case where a face inherits from
X-Git-Tag: emacs-pretest-22.0.90~6149
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=621e71ee736bd205fc7be46ee62bdb7fcea7b88c;p=emacs.git

(face-attribute): Handle the case where a face inherits from
a non-existent face.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 81a6a953aa5..8ca9e40d7d2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -374,8 +374,11 @@ completely specified)."
       ;; VALUE is relative, so merge with inherited faces
       (let ((inh-from (face-attribute face :inherit frame)))
 	(unless (or (null inh-from) (eq inh-from 'unspecified))
-	  (setq value
-		(face-attribute-merged-with attribute value inh-from frame)))))
+          (condition-case nil
+              (setq value
+                    (face-attribute-merged-with attribute value inh-from frame))
+            ;; The `inherit' attribute may point to non existent faces.
+            (error nil)))))
     (when (and inherit
 	       (not (eq inherit t))
 	       (face-attribute-relative-p attribute value))