Commit 5eb55db9 authored by Paul Eggert's avatar Paul Eggert
Browse files

* composite.c: Don't truncate sizes to 'int'.

(composition_gstring_p, composition_reseat_it)
(composition_adjust_point): Use EMACS_INT, not int.
parent 0703a717
2011-06-17 Paul Eggert <eggert@cs.ucla.edu> 2011-06-17 Paul Eggert <eggert@cs.ucla.edu>
* 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. * category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT.
* buffer.c: Include <verify.h>. * buffer.c: Include <verify.h>.
......
...@@ -705,7 +705,7 @@ int ...@@ -705,7 +705,7 @@ int
composition_gstring_p (Lisp_Object gstring) composition_gstring_p (Lisp_Object gstring)
{ {
Lisp_Object header; Lisp_Object header;
int i; EMACS_INT i;
if (! VECTORP (gstring) || ASIZE (gstring) < 2) if (! VECTORP (gstring) || ASIZE (gstring) < 2)
return 0; return 0;
...@@ -1252,7 +1252,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I ...@@ -1252,7 +1252,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
{ {
Lisp_Object lgstring = Qnil; Lisp_Object lgstring = Qnil;
Lisp_Object val, elt; Lisp_Object val, elt;
int i; EMACS_INT i;
val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch); val = CHAR_TABLE_REF (Vcomposition_function_table, cmp_it->ch);
for (i = 0; i < cmp_it->rule_idx; i++, val = XCDR (val)); 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,9 +1685,8 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit,
EMACS_INT EMACS_INT
composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt) composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt)
{ {
EMACS_INT beg, end; EMACS_INT i, beg, end;
Lisp_Object val; Lisp_Object val;
int i;
if (new_pt == BEGV || new_pt == ZV) if (new_pt == BEGV || new_pt == ZV)
return new_pt; return new_pt;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment