diff options
| author | Paul Eggert | 2011-06-17 01:27:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-17 01:27:36 -0700 |
| commit | 5eb55db9877dd34455e40f8836f50f3496abcbae (patch) | |
| tree | a82e03642b56e5f111e3ef582141040e3ec56f69 /src/composite.c | |
| parent | 0703a717821d3e1d0ee2b0b5f5f42c55fa97210f (diff) | |
| download | emacs-5eb55db9877dd34455e40f8836f50f3496abcbae.tar.gz emacs-5eb55db9877dd34455e40f8836f50f3496abcbae.zip | |
* 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 | |||
| 705 | composition_gstring_p (Lisp_Object gstring) | 705 | composition_gstring_p (Lisp_Object gstring) |
| 706 | { | 706 | { |
| 707 | Lisp_Object header; | 707 | Lisp_Object header; |
| 708 | int i; | 708 | EMACS_INT i; |
| 709 | 709 | ||
| 710 | if (! VECTORP (gstring) || ASIZE (gstring) < 2) | 710 | if (! VECTORP (gstring) || ASIZE (gstring) < 2) |
| 711 | return 0; | 711 | return 0; |
| @@ -1252,7 +1252,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I | |||
| 1252 | { | 1252 | { |
| 1253 | Lisp_Object lgstring = Qnil; | 1253 | Lisp_Object lgstring = Qnil; |
| 1254 | Lisp_Object val, elt; | 1254 | Lisp_Object val, elt; |
| 1255 | int i; | 1255 | EMACS_INT i; |
| 1256 | 1256 | ||
| 1257 | val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); | 1257 | val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); |
| 1258 | for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val)); | 1258 | 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, | |||
| 1685 | EMACS_INT | 1685 | EMACS_INT |
| 1686 | composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) | 1686 | composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) |
| 1687 | { | 1687 | { |
| 1688 | EMACS_INT beg, end; | 1688 | EMACS_INT i, beg, end; |
| 1689 | Lisp_Object val; | 1689 | Lisp_Object val; |
| 1690 | int i; | ||
| 1691 | 1690 | ||
| 1692 | if (new_pt == BEGV || new_pt == ZV) | 1691 | if (new_pt == BEGV || new_pt == ZV) |
| 1693 | return new_pt; | 1692 | return new_pt; |