* xdisp.c (handle_display_spec, display_prop_string_p): Use ptrdiff_t, not int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 99d645c0568fcfb613b2823f00b8ec192ce2bc7b..8ac09c6c821dcab1fcf0af0e1997aa55e2caced5 100644 (file)
--- 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 c53c4d58168e551ae39c57cfdfb454f0b2f0d3dd..e6a38f76dc569059bf2a6ca08f76d1a2203e64e8 100644 (file)
--- 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;