* buffer.c (struct sortstr.size, record_overlay_string): Don't truncate size to int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f10082..fcb6f66 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * buffer.c (struct sortvec.priority, struct sortstr.priority):
        Now EMACS_INT, not int.
        (compare_overlays, cmp_for_strings): Avoid subtraction overflow.
+       (struct sortstr.size, record_overlay_string): Don't truncate size to int.
 
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/src/buffer.c b/src/buffer.c
index 4487de1..90a10ec 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2926,7 +2926,7 @@ sort_overlays (Lisp_Object *overlay_vec, int noverlays, struct window *w)
 struct sortstr
 {
   Lisp_Object string, string2;
-  int size;
+  ptrdiff_t size;
   EMACS_INT priority;
 };
 
@@ -2962,7 +2962,8 @@ cmp_for_strings (const void *as1, const void *as2)
 }
 
 static void
-record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, Lisp_Object str2, Lisp_Object pri, int size)
+record_overlay_string (struct sortstrlist *ssl, Lisp_Object str,
+                      Lisp_Object str2, Lisp_Object pri, ptrdiff_t size)
 {
   EMACS_INT nbytes;