diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-17 01:27:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-17 01:27:36 -0700 |
| commit | 5eb55db9877dd34455e40f8836f50f3496abcbae (patch) | |
| tree | a82e03642b56e5f111e3ef582141040e3ec56f69 /src/composite.c | |
| parent | 0703a717821d3e1d0ee2b0b5f5f42c55fa97210f (diff) | |
| download | emacs-5eb55db9877dd34455e40f8836f50f3496abcbae.tar.gz | |
* composite.c: Don't truncate sizes to 'int'.
(composition_gstring_p, composition_reseat_it)
(composition_adjust_point): Use EMACS_INT, not int.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/composite.c b/src/composite.c index 51b7669cb4f..10946835705 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; |