From 5eb55db9877dd34455e40f8836f50f3496abcbae Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 17 Jun 2011 01:27:36 -0700 Subject: [PATCH] * composite.c: Don't truncate sizes to 'int'. (composition_gstring_p, composition_reseat_it) (composition_adjust_point): Use EMACS_INT, not int. --- src/ChangeLog | 4 ++++ src/composite.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4b31db3e26..6ff0fe4930 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-06-17 Paul Eggert + * composite.c: Don't truncate sizes to 'int'. + (composition_gstring_p, composition_reseat_it) + (composition_adjust_point): Use EMACS_INT, not int. + * category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT. * buffer.c: Include . diff --git a/src/composite.c b/src/composite.c index 51b7669cb4..1094683570 100644 --- a/src/composite.c +++ b/src/composite.c @@ -705,7 +705,7 @@ int composition_gstring_p (Lisp_Object gstring) { Lisp_Object header; - int i; + EMACS_INT i; if (! VECTORP (gstring) || ASIZE (gstring) < 2) return 0; @@ -1252,7 +1252,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I { Lisp_Object lgstring = Qnil; Lisp_Object val, elt; - int i; + EMACS_INT i; val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val)); @@ -1685,9 +1685,8 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) { - EMACS_INT beg, end; + EMACS_INT i, beg, end; Lisp_Object val; - int i; if (new_pt == BEGV || new_pt == ZV) return new_pt; -- 2.20.1