comparison src/xfaces.c @ 83405:1955a4462bf9

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
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 03 Dec 2005 14:25:50 +0000
parents 69e184bbba16 c5ff1098b0b8
children b98066f4aa10
comparison
equal deleted inserted replaced
83404:69e184bbba16 83405:1955a4462bf9
4702 VALUE does NOT specify a color. */ 4702 VALUE does NOT specify a color. */
4703 boolean_value = face_boolean_x_resource_value (value, 0); 4703 boolean_value = face_boolean_x_resource_value (value, 0);
4704 if (SYMBOLP (boolean_value)) 4704 if (SYMBOLP (boolean_value))
4705 value = boolean_value; 4705 value = boolean_value;
4706 } 4706 }
4707 else if (EQ (attr, QCbox)) 4707 else if (EQ (attr, QCbox) || EQ (attr, QCinherit))
4708 value = Fcar (Fread_from_string (value, Qnil, Qnil)); 4708 value = Fcar (Fread_from_string (value, Qnil, Qnil));
4709 4709
4710 return Finternal_set_lisp_face_attribute (face, attr, value, frame); 4710 return Finternal_set_lisp_face_attribute (face, attr, value, frame);
4711 } 4711 }
4712 4712