diff options
| author | Eli Zaretskii | 2010-09-25 08:31:15 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2010-09-25 08:31:15 -0400 |
| commit | f877c546db4d53d4076715323bd151ab6c3347a5 (patch) | |
| tree | eeadbbe340b082d517dacc33290e93f756069d7c /src/term.c | |
| parent | 40b1a3a937512ff35884df2e8e19c3feed9f2688 (diff) | |
| download | emacs-f877c546db4d53d4076715323bd151ab6c3347a5.tar.gz emacs-f877c546db4d53d4076715323bd151ab6c3347a5.zip | |
Fix int/EMACS_INT use in process.c and term.c.
term.c (fast_find_position, term_mouse_highlight): Use EMACS_INT
for buffer positions.
process.c (read_process_output, send_process)
(Fprocess_send_region, status_notify): Use EMACS_INT for buffer
and string positions and size.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/term.c b/src/term.c index 2deca1014e8..1b4484470e0 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2618,9 +2618,10 @@ term_clear_mouse_face (void) | |||
| 2618 | If POS is after end of W, return end of last line in W. | 2618 | If POS is after end of W, return end of last line in W. |
| 2619 | - taken from msdos.c */ | 2619 | - taken from msdos.c */ |
| 2620 | static int | 2620 | static int |
| 2621 | fast_find_position (struct window *w, int pos, int *hpos, int *vpos) | 2621 | fast_find_position (struct window *w, EMACS_INT pos, int *hpos, int *vpos) |
| 2622 | { | 2622 | { |
| 2623 | int i, lastcol, line_start_position, maybe_next_line_p = 0; | 2623 | int i, lastcol, maybe_next_line_p = 0; |
| 2624 | EMACS_INT line_start_position; | ||
| 2624 | int yb = window_text_bottom_y (w); | 2625 | int yb = window_text_bottom_y (w); |
| 2625 | struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0), *best_row = row; | 2626 | struct glyph_row *row = MATRIX_ROW (w->current_matrix, 0), *best_row = row; |
| 2626 | 2627 | ||
| @@ -2658,7 +2659,7 @@ fast_find_position (struct window *w, int pos, int *hpos, int *vpos) | |||
| 2658 | for (i = 0; i < row->used[TEXT_AREA]; i++) | 2659 | for (i = 0; i < row->used[TEXT_AREA]; i++) |
| 2659 | { | 2660 | { |
| 2660 | struct glyph *glyph = row->glyphs[TEXT_AREA] + i; | 2661 | struct glyph *glyph = row->glyphs[TEXT_AREA] + i; |
| 2661 | int charpos; | 2662 | EMACS_INT charpos; |
| 2662 | 2663 | ||
| 2663 | charpos = glyph->charpos; | 2664 | charpos = glyph->charpos; |
| 2664 | if (charpos == pos) | 2665 | if (charpos == pos) |
| @@ -2719,7 +2720,8 @@ term_mouse_highlight (struct frame *f, int x, int y) | |||
| 2719 | && XFASTINT (w->last_modified) == BUF_MODIFF (b) | 2720 | && XFASTINT (w->last_modified) == BUF_MODIFF (b) |
| 2720 | && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) | 2721 | && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) |
| 2721 | { | 2722 | { |
| 2722 | int pos, i, nrows = w->current_matrix->nrows; | 2723 | int i, nrows = w->current_matrix->nrows; |
| 2724 | EMACS_INT pos; | ||
| 2723 | struct glyph_row *row; | 2725 | struct glyph_row *row; |
| 2724 | struct glyph *glyph; | 2726 | struct glyph *glyph; |
| 2725 | 2727 | ||
| @@ -2763,7 +2765,8 @@ term_mouse_highlight (struct frame *f, int x, int y) | |||
| 2763 | /* Check for mouse-face. */ | 2765 | /* Check for mouse-face. */ |
| 2764 | { | 2766 | { |
| 2765 | Lisp_Object mouse_face, overlay, position, *overlay_vec; | 2767 | Lisp_Object mouse_face, overlay, position, *overlay_vec; |
| 2766 | int noverlays, obegv, ozv; | 2768 | int noverlays; |
| 2769 | EMACS_INT obegv, ozv; | ||
| 2767 | struct buffer *obuf; | 2770 | struct buffer *obuf; |
| 2768 | 2771 | ||
| 2769 | /* If we get an out-of-range value, return now; avoid an error. */ | 2772 | /* If we get an out-of-range value, return now; avoid an error. */ |