diff options
| author | Paul Eggert | 2011-06-17 12:45:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-17 12:45:29 -0700 |
| commit | 7d100a81b7b1127f55cd1033ce5a6ce2d350ba19 (patch) | |
| tree | d8fc16f65f46808d9eaec2d26be93611d813e313 /src/composite.c | |
| parent | 5eb55db9877dd34455e40f8836f50f3496abcbae (diff) | |
| download | emacs-7d100a81b7b1127f55cd1033ce5a6ce2d350ba19.tar.gz emacs-7d100a81b7b1127f55cd1033ce5a6ce2d350ba19.zip | |
* composite.c (get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
not EMACS_UINT, for indexes.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/composite.c b/src/composite.c index 10946835705..1bc7b435e11 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -285,7 +285,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, | |||
| 285 | && VECTORP (AREF (components, 0))) | 285 | && VECTORP (AREF (components, 0))) |
| 286 | { | 286 | { |
| 287 | /* COMPONENTS is a glyph-string. */ | 287 | /* COMPONENTS is a glyph-string. */ |
| 288 | EMACS_UINT len = ASIZE (key); | 288 | EMACS_INT len = ASIZE (key); |
| 289 | 289 | ||
| 290 | for (i = 1; i < len; i++) | 290 | for (i = 1; i < len; i++) |
| 291 | if (! VECTORP (AREF (key, i))) | 291 | if (! VECTORP (AREF (key, i))) |
| @@ -293,7 +293,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, | |||
| 293 | } | 293 | } |
| 294 | else if (VECTORP (components) || CONSP (components)) | 294 | else if (VECTORP (components) || CONSP (components)) |
| 295 | { | 295 | { |
| 296 | EMACS_UINT len = ASIZE (key); | 296 | EMACS_INT len = ASIZE (key); |
| 297 | 297 | ||
| 298 | /* The number of elements should be odd. */ | 298 | /* The number of elements should be odd. */ |
| 299 | if ((len % 2) == 0) | 299 | if ((len % 2) == 0) |
| @@ -673,7 +673,7 @@ composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len) | |||
| 673 | hash = h->hashfn (h, header); | 673 | hash = h->hashfn (h, header); |
| 674 | if (len < 0) | 674 | if (len < 0) |
| 675 | { | 675 | { |
| 676 | EMACS_UINT j, glyph_len = LGSTRING_GLYPH_LEN (gstring); | 676 | EMACS_INT j, glyph_len = LGSTRING_GLYPH_LEN (gstring); |
| 677 | for (j = 0; j < glyph_len; j++) | 677 | for (j = 0; j < glyph_len; j++) |
| 678 | if (NILP (LGSTRING_GLYPH (gstring, j))) | 678 | if (NILP (LGSTRING_GLYPH (gstring, j))) |
| 679 | break; | 679 | break; |