Merge from origin/emacs-26

39d3e8b Fix last change in 'char_width'
67679f0 Add initial tests for wdired.el

1 files changed, 7 insertions, 4 deletions

diff --git a/src/character.c b/src/character.c
index b17f44b1422..8920da2748f 100644
--- a/src/character.c
+++ b/src/character.c
@@ -289,15 +289,18 @@ char_width (int c, struct Lisp_Char_Table *dp)
       if (VECTORP (disp))
         for (i = 0, width = 0; i < ASIZE (disp); i++)
           {
-            int c;
+            int c = -1;
             ch = AREF (disp, i);
             if (GLYPH_CODE_P (ch))
               c = GLYPH_CODE_CHAR (ch);
             else if (CHARACTERP (ch))
               c = XFASTINT (ch);
-            int w = CHARACTER_WIDTH (c);
-            if (INT_ADD_WRAPV (width, w, &width))
-              string_overflow ();
+            if (c >= 0)
+              {
+                int w = CHARACTER_WIDTH (c);
+                if (INT_ADD_WRAPV (width, w, &width))
+                  string_overflow ();
+              }
           }
     }
   return width;