Merge remote-tracking branch 'origin/master' into feature/bignum

1 files changed, 8 insertions, 2 deletions

diff --git a/src/character.c b/src/character.c
index 97698d77890..851e61e778f 100644
--- a/src/character.c
+++ b/src/character.c
@@ -34,6 +34,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "character.h"
 #include "buffer.h"
+#include "dispextern.h"
 #include "composite.h"
 #include "disptab.h"
 
@@ -288,10 +289,15 @@ char_width (int c, struct Lisp_Char_Table *dp)
       if (VECTORP (disp))
         for (i = 0, width = 0; i < ASIZE (disp); i++)
           {
+            int c = -1;
             ch = AREF (disp, i);
-            if (CHARACTERP (ch))
+            if (GLYPH_CODE_P (ch))
+              c = GLYPH_CODE_CHAR (ch);
+            else if (CHARACTERP (ch))
+              c = XFASTINT (ch);
+            if (c >= 0)
               {
-                int w = CHARACTER_WIDTH (XFIXNAT (ch));
+                int w = CHARACTER_WIDTH (c);
                 if (INT_ADD_WRAPV (width, w, &width))
                   string_overflow ();
               }