From 466a04d6c5c177140fd3f92f22fbe6ecd2f04d48 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 1 Nov 2001 10:15:36 +0000 Subject: [PATCH] (Finternal_set_lisp_face_attribute_from_resource): Handle :box so that it is possible to specify sexprs. --- src/ChangeLog | 5 +++++ src/xfaces.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a36c86f5ceb..747e6a601c4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-11-01 Gerd Moellmann + + * xfaces.c (Finternal_set_lisp_face_attribute_from_resource): + Handle :box so that it is possible to specify sexprs. + 2001-10-31 Eli Zaretskii * s/hpux11.h: New file. diff --git a/src/xfaces.c b/src/xfaces.c index cc1a0b25760..0f8ed1feda2 100644 --- 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); } -- 2.39.2