From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Nov 2005 11:06:53 +0000 (+0000)
Subject: (Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
X-Git-Tag: emacs-pretest-22.0.90~5670
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ad040ffe59304d3311561ca8577cfa7220cc096;p=emacs.git

(Finternal_set_lisp_face_attribute_from_resource): Handle :inherit property
as a lisp expression.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 7923686eb50..9a34717b778 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4687,7 +4687,7 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
       if (SYMBOLP (boolean_value))
 	value = boolean_value;
     }
-  else if (EQ (attr, QCbox))
+  else if (EQ (attr, QCbox) || EQ (attr, QCinherit))
     value = Fcar (Fread_from_string (value, Qnil, Qnil));
 
   return Finternal_set_lisp_face_attribute (face, attr, value, frame);