(Finternal_set_lisp_face_attribute_from_resource):

Handle :box so that it is possible to specify sexprs.

diff --git a/src/ChangeLog b/src/ChangeLog
index a36c86f5ceba896f077d770c8039be35e061cc77..747e6a601c4670e760591aa798bc23794d01a098 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-01  Gerd Moellmann  <gerd@gnu.org>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): 
+       Handle :box so that it is possible to specify sexprs.
+
 2001-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * s/hpux11.h: New file.

diff --git a/src/xfaces.c b/src/xfaces.c
index cc1a0b25760e2d5f227deb313f1a3eebc8ac1b44..0f8ed1feda20d735a8b81885842710423e460a62 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4391,8 +4391,7 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
     value = face_boolean_x_resource_value (value, 1);
   else if (EQ (attr, QCunderline)
           || EQ (attr, QCoverline)
-          || EQ (attr, QCstrike_through)
-          || EQ (attr, QCbox))
+          || EQ (attr, QCstrike_through))
     {
       Lisp_Object boolean_value;
 
@@ -4402,6 +4401,8 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
       if (SYMBOLP (boolean_value))
        value = boolean_value;
     }
+  else if (EQ (attr, QCbox))
+    value = Fcar (Fread_from_string (value, Qnil, Qnil));
 
   return Finternal_set_lisp_face_attribute (face, attr, value, frame);
 }