mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-17 16:41:17 -08:00
Code Issues Projects Releases Wiki Activity

Fix validation of :box face attribute

Browse source 
* src/xfaces.c (Finternal_set_lisp_face_attribute): Fix the logic
of validating the :box attribute.  The previous code would always
allow invalid attributes of :box as long as the invalid attribute
was the last in the list.  (Bug#67404)
This commit is contained in:
Eli Zaretskii 2023-11-30 17:17:02 +02:00
parent a911852119
commit dcd755dabc
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xfaces.c
View file

@ -3371,12 +3371,13 @@ FRAME 0 means change the face on all frames, and change the default
if (!CONSP (tem))
break;
v = XCAR (tem);
tem = XCDR (tem);
if (EQ (k, QCline_width))
{
if ((!CONSP(v) || !FIXNUMP (XCAR (v)) || XFIXNUM (XCAR (v)) == 0
|| !FIXNUMP (XCDR (v)) || XFIXNUM (XCDR (v)) == 0)
if ((!CONSP(v)
|| !FIXNUMP (XCAR (v))
|| XFIXNUM (XCAR (v)) == 0
|| !FIXNUMP (XCDR (v)) || XFIXNUM (XCDR (v)) == 0)
&& (!FIXNUMP (v) || XFIXNUM (v) == 0))
break;
}
@ -3393,6 +3394,8 @@ FRAME 0 means change the face on all frames, and change the default
}
else
break;
tem = XCDR (tem);
}
valid_p = NILP (tem);