diff options
| author | Paul Eggert | 2011-07-19 14:39:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-19 14:39:36 -0700 |
| commit | ebfa62c01481332072f519581aaf4d8d7da49e68 (patch) | |
| tree | c62f6a866f44165112999f66f5ca7e5f30dc2af3 /src/window.c | |
| parent | 63cf7836ae7616ce91d7eeaeac997d71609e191b (diff) | |
| download | emacs-ebfa62c01481332072f519581aaf4d8d7da49e68.tar.gz emacs-ebfa62c01481332072f519581aaf4d8d7da49e68.zip | |
Use ptrdiff_t for composition IDs.
* character.c (lisp_string_width):
* composite.c (composition_table_size, n_compositions)
(get_composition_id, composition_gstring_from_id):
* dispextern.h (struct glyph_string.cmp_id, struct composition_it.id):
* xdisp.c (BUILD_COMPOSITE_GLYPH_STRING):
* window.c (Frecenter):
Use ptrdiff_t, not int, for composition IDs.
* composite.c (get_composition_id): Check for integer overflow.
* composite.h: Adjust prototypes to match the above changes.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 3f5a743f5c6..04fea6b9bf6 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5069,7 +5069,7 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5069 | && (!EQ (Vrecenter_redisplay, Qtty) | 5069 | && (!EQ (Vrecenter_redisplay, Qtty) |
| 5070 | || !NILP (Ftty_type (selected_frame)))) | 5070 | || !NILP (Ftty_type (selected_frame)))) |
| 5071 | { | 5071 | { |
| 5072 | int i; | 5072 | ptrdiff_t i; |
| 5073 | 5073 | ||
| 5074 | /* Invalidate pixel data calculated for all compositions. */ | 5074 | /* Invalidate pixel data calculated for all compositions. */ |
| 5075 | for (i = 0; i < n_compositions; i++) | 5075 | for (i = 0; i < n_compositions; i++) |