(ftfont_spec_pattern): Don't create a charset of the

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 1e19033b5a467e9e350d0d457d4098c7aeb3c305..257ca66632db4271688943413cd4a5408611a237 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -865,7 +865,7 @@ fill_gstring_body (gstring)
   for (i = 0; i < len; i++)
     {
       Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-      int c = XINT (AREF (header, i + 1));
+      EMACS_INT c = XINT (AREF (header, i + 1));
 
       if (NILP (g))
        {
@@ -1142,7 +1142,7 @@ composition_update_it (cmp_it, charpos, bytepos, string)
          Lisp_Object glyph = LGSTRING_GLYPH (gstring, cmp_it->from);
          int from = LGLYPH_FROM (glyph);
 
-         c = LGSTRING_CHAR (gstring, from);
+         c = XINT (LGSTRING_CHAR (gstring, from));
          cmp_it->nchars = LGLYPH_TO (glyph) - from + 1;
          cmp_it->width = (LGLYPH_WIDTH (glyph) > 0
                           ? CHAR_WIDTH (LGLYPH_CHAR (glyph)) : 0);