diff options
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 51217e3106d..7163a2c98b2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11103,7 +11103,7 @@ int debug_dvpos, debug_dy; /* Delta in characters and bytes for try_window_id. */ -int debug_delta, debug_delta_bytes; +EMACS_INT debug_delta, debug_delta_bytes; /* Values of window_end_pos and window_end_vpos at the end of try_window_id. */ @@ -11834,7 +11834,7 @@ redisplay_internal (int preserve_echo_area) { struct glyph_row *row = MATRIX_ROW (w->current_matrix, this_line_vpos + 1); - int delta, delta_bytes; + EMACS_INT delta, delta_bytes; /* We used to distinguish between two cases here, conditioned by Z - CHARPOS (tlendpos) == ZV, for @@ -12463,7 +12463,8 @@ redisplay_window_1 (Lisp_Object window) int set_cursor_from_row (struct window *w, struct glyph_row *row, - struct glyph_matrix *matrix, int delta, int delta_bytes, + struct glyph_matrix *matrix, + EMACS_INT delta, EMACS_INT delta_bytes, int dy, int dvpos) { struct glyph *glyph = row->glyphs[TEXT_AREA]; @@ -15056,7 +15057,7 @@ try_window_reusing_current_matrix (struct window *w) static struct glyph_row *find_last_unchanged_at_beg_row (struct window *); static struct glyph_row *find_first_unchanged_at_end_row (struct window *, - int *, int *); + EMACS_INT *, EMACS_INT *); static struct glyph_row * find_last_row_displaying_text (struct glyph_matrix *, struct it *, struct glyph_row *); @@ -15151,7 +15152,8 @@ find_last_unchanged_at_beg_row (struct window *w) changes. */ static struct glyph_row * -find_first_unchanged_at_end_row (struct window *w, int *delta, int *delta_bytes) +find_first_unchanged_at_end_row (struct window *w, + EMACS_INT *delta, EMACS_INT *delta_bytes) { struct glyph_row *row; struct glyph_row *row_found = NULL; @@ -15382,13 +15384,14 @@ try_window_id (struct window *w) struct glyph_row *bottom_row; int bottom_vpos; struct it it; - int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy; + EMACS_INT delta = 0, delta_bytes = 0, stop_pos; + int dvpos, dy; struct text_pos start_pos; struct run run; int first_unchanged_at_end_vpos = 0; struct glyph_row *last_text_row, *last_text_row_at_end; struct text_pos start; - int first_changed_charpos, last_changed_charpos; + EMACS_INT first_changed_charpos, last_changed_charpos; #if GLYPH_DEBUG if (inhibit_try_window_id) @@ -15515,7 +15518,7 @@ try_window_id (struct window *w) || (last_changed_charpos < CHARPOS (start) - 1 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n'))) { - int Z_old, delta, Z_BYTE_old, delta_bytes; + EMACS_INT Z_old, delta, Z_BYTE_old, delta_bytes; struct glyph_row *r0; /* Compute how many chars/bytes have been added to or removed @@ -24167,7 +24170,8 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Cursor cursor = FRAME_X_OUTPUT (f)->nontext_cursor; Lisp_Object pointer = Qnil; - int charpos, dx, dy, width, height; + int dx, dy, width, height; + EMACS_INT charpos; Lisp_Object string, object = Qnil; Lisp_Object pos, help; |