diff options
Diffstat (limited to 'src/intervals.c')
| -rw-r--r-- | src/intervals.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/intervals.c b/src/intervals.c index 3e73110845d..8f3840976d0 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -1313,7 +1313,7 @@ delete_interval (register INTERVAL i) | |||
| 1313 | Do this by recursing down TREE to the interval in question, and | 1313 | Do this by recursing down TREE to the interval in question, and |
| 1314 | deleting the appropriate amount of text. */ | 1314 | deleting the appropriate amount of text. */ |
| 1315 | 1315 | ||
| 1316 | static EMACS_UINT | 1316 | static EMACS_INT |
| 1317 | interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, | 1317 | interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, |
| 1318 | register EMACS_INT amount) | 1318 | register EMACS_INT amount) |
| 1319 | { | 1319 | { |
| @@ -1325,9 +1325,9 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, | |||
| 1325 | /* Left branch */ | 1325 | /* Left branch */ |
| 1326 | if (relative_position < LEFT_TOTAL_LENGTH (tree)) | 1326 | if (relative_position < LEFT_TOTAL_LENGTH (tree)) |
| 1327 | { | 1327 | { |
| 1328 | EMACS_UINT subtract = interval_deletion_adjustment (tree->left, | 1328 | EMACS_INT subtract = interval_deletion_adjustment (tree->left, |
| 1329 | relative_position, | 1329 | relative_position, |
| 1330 | amount); | 1330 | amount); |
| 1331 | tree->total_length -= subtract; | 1331 | tree->total_length -= subtract; |
| 1332 | CHECK_TOTAL_LENGTH (tree); | 1332 | CHECK_TOTAL_LENGTH (tree); |
| 1333 | return subtract; | 1333 | return subtract; |
| @@ -1336,7 +1336,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, | |||
| 1336 | else if (relative_position >= (TOTAL_LENGTH (tree) | 1336 | else if (relative_position >= (TOTAL_LENGTH (tree) |
| 1337 | - RIGHT_TOTAL_LENGTH (tree))) | 1337 | - RIGHT_TOTAL_LENGTH (tree))) |
| 1338 | { | 1338 | { |
| 1339 | EMACS_UINT subtract; | 1339 | EMACS_INT subtract; |
| 1340 | 1340 | ||
| 1341 | relative_position -= (tree->total_length | 1341 | relative_position -= (tree->total_length |
| 1342 | - RIGHT_TOTAL_LENGTH (tree)); | 1342 | - RIGHT_TOTAL_LENGTH (tree)); |
| @@ -1378,7 +1378,7 @@ static void | |||
| 1378 | adjust_intervals_for_deletion (struct buffer *buffer, | 1378 | adjust_intervals_for_deletion (struct buffer *buffer, |
| 1379 | EMACS_INT start, EMACS_INT length) | 1379 | EMACS_INT start, EMACS_INT length) |
| 1380 | { | 1380 | { |
| 1381 | register EMACS_UINT left_to_delete = length; | 1381 | register EMACS_INT left_to_delete = length; |
| 1382 | register INTERVAL tree = BUF_INTERVALS (buffer); | 1382 | register INTERVAL tree = BUF_INTERVALS (buffer); |
| 1383 | Lisp_Object parent; | 1383 | Lisp_Object parent; |
| 1384 | EMACS_INT offset; | 1384 | EMACS_INT offset; |