From 4c321dc8d6b059ddaf5aab137aadbae18a3cb5af Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 28 Jul 2018 15:36:04 -0700 Subject: [PATCH] Adjust recent Bug#32276 fix * src/character.c (char_width): Make explicit the assumption that a display character vector element is a character if is not a glyph code. --- src/character.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/character.c b/src/character.c index 48268e0..6af9825 100644 --- a/src/character.c +++ b/src/character.c @@ -293,8 +293,11 @@ char_width (int c, struct Lisp_Char_Table *dp) ch = AREF (disp, i); if (GLYPH_CODE_P (ch)) c = GLYPH_CODE_CHAR (ch); - else if (CHARACTERP (ch)) - c = XFASTINT (ch); + else + { + eassert (CHARACTERP (ch)); + c = XFASTINT (ch); + } int w = CHARACTER_WIDTH (c); if (INT_ADD_WRAPV (width, w, &width)) string_overflow (); -- 2.7.4