(composition_adjust_point): Fix int/EMACS_INT mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b4e4cfe089e2d55b4c55ec195dac5006c208793..1e9f491a6558910ef48bcd8d9b2650b886da08bd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-17  Romain Francoise  <romain@orebokech.com>
+
+       * composite.c (composition_adjust_point): Fix int/EMACS_INT mixup.
+
 2008-09-17  Kenichi Handa  <handa@m17n.org>
 
        * ftfont.c (ftfont_shape_by_flt): Downcase family name.

diff --git a/src/composite.c b/src/composite.c
index 576e0c8a402d35d0832f5778b081326d060e983f..95f700c7116a9ddbd6c86d47b5e518f9e273cca6 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1429,7 +1429,7 @@ composition_adjust_point (last_pt)
     return PT;
 
   /* Next check the automatic composition.  */
-  if (! find_automatic_composition (PT, -1, &beg, &end, &val, Qnil)
+  if (! find_automatic_composition (PT, (EMACS_INT) -1, &beg, &end, &val, Qnil)
       || beg == PT)
     return PT;
   for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++)