# HG changeset patch # User Romain Francoise # Date 1221678969 0 # Node ID b5e444f66902d9d32fa0bf959b5f866d51386799 # Parent 1e59cb040cab18ccc2a0273dcd8264b658fa710e (composition_adjust_point): Fix int/EMACS_INT mixup. diff -r 1e59cb040cab -r b5e444f66902 src/ChangeLog --- 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 + + * composite.c (composition_adjust_point): Fix int/EMACS_INT mixup. + 2008-09-17 Kenichi Handa * ftfont.c (ftfont_shape_by_flt): Downcase family name. diff -r 1e59cb040cab -r b5e444f66902 src/composite.c --- 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++)