From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 27 Sep 2011 16:03:48 +0000 (-0700)
Subject: * xdisp.c (handle_display_spec, display_prop_string_p): Use ptrdiff_t, not int.
X-Git-Tag: emacs-24.2.90~471^2~6^2~176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43ad2e9af4e92fa795fb3b1fc5d793a76595a34f;p=emacs.git

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

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;