[Emacs-diffs] /srv/bzr/emacs/trunk r101569: Use EMACS_INT instead of EMACS_UINT in intervals.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101569
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 14:54:49 -0400
message:
  Use EMACS_INT instead of EMACS_UINT in intervals.c.
  
   The latter causes crashes, since LENGTH macro in intervals.h:114 has to be
   able to return a negative number.
modified:
  src/ChangeLog
  src/intervals.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-23 18:50:57 +0000
+++ b/src/ChangeLog     2010-09-23 18:54:49 +0000
@@ -57,7 +57,7 @@
        (move_if_not_intangible, get_local_map, copy_intervals)
        (copy_intervals_to_string, compare_string_intervals)
        (set_intervals_multibyte_1): Use EMACS_INT for buffer positions
-       and EMACS_UINT for interval tree size.
+       and for interval tree size.
 
        * intervals.h (traverse_intervals, split_interval_right)
        (split_interval_left, find_interval, offset_intervals)

=== modified file 'src/intervals.c'
--- a/src/intervals.c   2010-09-23 18:50:57 +0000
+++ b/src/intervals.c   2010-09-23 18:54:49 +0000
@@ -1326,8 +1326,8 @@
   if (relative_position < LEFT_TOTAL_LENGTH (tree))
     {
       EMACS_INT subtract = interval_deletion_adjustment (tree->left,
-                                                        relative_position,
-                                                        amount);
+                                                         relative_position,
+                                                         amount);
       tree->total_length -= subtract;
       CHECK_TOTAL_LENGTH (tree);
       return subtract;