Merged from miles@gnu.org--gnu-2005 (patch 659-663)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-660
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-663
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-445

1 files changed, 1 insertions, 1 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index c096b15ba1f..7c9230f1140 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4704,7 +4704,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);