From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 20 Sep 2021 12:22:07 +0000 (+0300)
Subject: Fix assertion violation with zero-width :box attributes
X-Git-Tag: emacs-28.0.90~815
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d16e51e8d289400f6724ed9a568da7fb2237a472;p=emacs.git

Fix assertion violation with zero-width :box attributes

* src/xfaces.c (merge_face_ref): Don't allow :box attribute with a
zero value.  (Bug#50699)
---

diff --git a/src/xfaces.c b/src/xfaces.c
index aefed54ebcb..c5b7a568aeb 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2709,7 +2709,7 @@ merge_face_ref (struct window *w,
 		{
 		  if (EQ (value, Qt))
 		    value = make_fixnum (1);
-		  if (FIXNUMP (value)
+		  if ((FIXNUMP (value) && XFIXNUM (value) != 0)
 		      || STRINGP (value)
 		      || CONSP (value)
 		      || NILP (value))