Mercurial > emacs

changeset 98209:b5e444f66902

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(composition_adjust_point): Fix int/EMACS_INT mixup.
author Romain Francoise <romain@orebokech.com>
date Wed, 17 Sep 2008 19:16:09 +0000
parents 1e59cb040cab
children 2b86022634a8
files src/ChangeLog src/composite.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Sep 17 11:49:06 2008 +0000
+++ b/src/ChangeLog	Wed Sep 17 19:16:09 2008 +0000
@@ -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.
--- a/src/composite.c	Wed Sep 17 11:49:06 2008 +0000
+++ b/src/composite.c	Wed Sep 17 19:16:09 2008 +0000
@@ -1429,7 +1429,7 @@
     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++)