From 43ad2e9af4e92fa795fb3b1fc5d793a76595a34f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 27 Sep 2011 09:03:48 -0700 Subject: [PATCH] * xdisp.c (handle_display_spec, display_prop_string_p): Use ptrdiff_t, not int. --- src/ChangeLog | 1 + src/xdisp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 99d645c0568..8ac09c6c821 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -705,6 +705,7 @@ (update_tool_bar, hscroll_window_tree, redisplay_internal) (redisplay_window, dump_glyph_row, display_mode_line) (Fformat_mode_line, decode_mode_spec, on_hot_spot_p): + (handle_display_spec, display_prop_string_p): Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. (handle_single_display_spec, build_desired_tool_bar_string) (redisplay_tool_bar, scroll_window_tree, Fdump_glyph_matrix) diff --git a/src/xdisp.c b/src/xdisp.c index c53c4d58168..e6a38f76dc5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4297,7 +4297,7 @@ handle_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, } else if (VECTORP (spec)) { - int i; + ptrdiff_t i; for (i = 0; i < ASIZE (spec); ++i) if ((rv = handle_single_display_spec (it, AREF (spec, i), object, overlay, position, bufpos, @@ -4874,7 +4874,7 @@ display_prop_string_p (Lisp_Object prop, Lisp_Object string) else if (VECTORP (prop)) { /* A vector of sub-properties. */ - int i; + ptrdiff_t i; for (i = 0; i < ASIZE (prop); ++i) if (single_display_spec_string_p (AREF (prop, i), string)) return 1; -- 2.39.2