emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master d16e51e: Fix assertion violation with zero-width :box attributes


From: Eli Zaretskii
Subject: master d16e51e: Fix assertion violation with zero-width :box attributes
Date: Mon, 20 Sep 2021 08:23:00 -0400 (EDT)

branch: master
commit d16e51e8d289400f6724ed9a568da7fb2237a472
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 src/xfaces.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xfaces.c b/src/xfaces.c
index aefed54..c5b7a56 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]