Merge from mainline.

[bpt/emacs.git] / src / character.c

diff --git a/src/character.c b/src/character.c
index 8bab709..64ea262 100644 (file)
--- a/src/character.c
+++ b/src/character.c
@@ -356,7 +356,7 @@ c_string_width (const unsigned char *str, EMACS_INT len, int precision,
        {
          val = DISP_CHAR_VECTOR (dp, c);
          if (VECTORP (val))
-           thiswidth = XVECTOR (val)->size;
+           thiswidth = ASIZE (val);
          else
            thiswidth = CHAR_WIDTH (c);
        }
@@ -445,7 +445,7 @@ lisp_string_width (Lisp_Object string, int precision,
            {
              val = DISP_CHAR_VECTOR (dp, c);
              if (VECTORP (val))
-               thiswidth = XVECTOR (val)->size;
+               thiswidth = ASIZE (val);
              else
                thiswidth = CHAR_WIDTH (c);
            }