aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-09-27 09:03:48 -0700
committerPaul Eggert2011-09-27 09:03:48 -0700
commit43ad2e9af4e92fa795fb3b1fc5d793a76595a34f (patch)
treebd58b5edceb0bde26d46be44c20ab15c7d60b490 /src
parent3460fdb79911e4f5012de4262e610ddbcfcfc9e5 (diff)
downloademacs-43ad2e9af4e92fa795fb3b1fc5d793a76595a34f.tar.gz
emacs-43ad2e9af4e92fa795fb3b1fc5d793a76595a34f.zip
* xdisp.c (handle_display_spec, display_prop_string_p): Use ptrdiff_t, not int.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xdisp.c4
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 @@
705 (update_tool_bar, hscroll_window_tree, redisplay_internal) 705 (update_tool_bar, hscroll_window_tree, redisplay_internal)
706 (redisplay_window, dump_glyph_row, display_mode_line) 706 (redisplay_window, dump_glyph_row, display_mode_line)
707 (Fformat_mode_line, decode_mode_spec, on_hot_spot_p): 707 (Fformat_mode_line, decode_mode_spec, on_hot_spot_p):
708 (handle_display_spec, display_prop_string_p):
708 Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. 709 Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts.
709 (handle_single_display_spec, build_desired_tool_bar_string) 710 (handle_single_display_spec, build_desired_tool_bar_string)
710 (redisplay_tool_bar, scroll_window_tree, Fdump_glyph_matrix) 711 (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,
4297 } 4297 }
4298 else if (VECTORP (spec)) 4298 else if (VECTORP (spec))
4299 { 4299 {
4300 int i; 4300 ptrdiff_t i;
4301 for (i = 0; i < ASIZE (spec); ++i) 4301 for (i = 0; i < ASIZE (spec); ++i)
4302 if ((rv = handle_single_display_spec (it, AREF (spec, i), object, 4302 if ((rv = handle_single_display_spec (it, AREF (spec, i), object,
4303 overlay, position, bufpos, 4303 overlay, position, bufpos,
@@ -4874,7 +4874,7 @@ display_prop_string_p (Lisp_Object prop, Lisp_Object string)
4874 else if (VECTORP (prop)) 4874 else if (VECTORP (prop))
4875 { 4875 {
4876 /* A vector of sub-properties. */ 4876 /* A vector of sub-properties. */
4877 int i; 4877 ptrdiff_t i;
4878 for (i = 0; i < ASIZE (prop); ++i) 4878 for (i = 0; i < ASIZE (prop); ++i)
4879 if (single_display_spec_string_p (AREF (prop, i), string)) 4879 if (single_display_spec_string_p (AREF (prop, i), string))
4880 return 1; 4880 return 1;