(Finternal_set_lisp_face_attribute_from_resource):

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

2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c30d5af1db2..c2e675db815 100644
--- 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-11-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * xfaces.c (Finternal_merge_in_global_face): Reindent.
diff --git a/src/xfaces.c b/src/xfaces.c
index 8d4447a7746..cb0c47643f3 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4383,8 +4383,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;
 
@@ -4394,6 +4393,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);
 }