* composite.c: Use int, not EMACS_INT, for characters.

(fill_gstring_body, composition_compute_stop_pos): Use int, not
EMACS_INT, for values that are known to be in character range.
This doesn't fix any bugs but is the usual style inside Emacs and
may generate better code on 32-bit machines.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a6ae7d53cf8ecf21f3b2fac1c1fbb8a52d65ee5..8f98b251234180071c65b6ede95be1bcc73cdbc8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * composite.c: Use int, not EMACS_INT, for characters.
+       (fill_gstring_body, composition_compute_stop_pos): Use int, not
+       EMACS_INT, for values that are known to be in character range.
+       This doesn't fix any bugs but is the usual style inside Emacs and
+       may generate better code on 32-bit machines.
+
        Make sure a 64-bit char is never passed to ENCODE_CHAR.
        This is for reasons similar to the recent CHAR_STRING fix.
        * charset.c (Fencode_char): Check that character arg is actually

diff --git a/src/composite.c b/src/composite.c
index ab9ec3f5a03acf883f517e5d5d7b8eb44bedb02e..51b7669cb4f2378501263a4eaeb7411d664dcf87 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -858,7 +858,7 @@ fill_gstring_body (Lisp_Object gstring)
   for (i = 0; i < len; i++)
     {
       Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-      EMACS_INT c = XINT (AREF (header, i + 1));
+      int c = XFASTINT (AREF (header, i + 1));
 
       if (NILP (g))
        {
@@ -995,7 +995,8 @@ static int _work_char;
 void
 composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT endpos, Lisp_Object string)
 {
-  EMACS_INT start, end, c;
+  EMACS_INT start, end;
+  int c;
   Lisp_Object prop, val;
   /* This is from forward_to_next_line_start in xdisp.c.  */
   const int MAX_NEWLINE_DISTANCE = 500;