aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-04 09:47:31 -0700
committerPaul Eggert2011-04-04 09:47:31 -0700
commitaa86731f7416c8739f206d0c5eca52e2a6d3c827 (patch)
tree8663dd3666b77d839e64a384aa6783947d5d8eda /src
parentdc6c6455c297840eb8c6a68a7c0d8755c6c33501 (diff)
downloademacs-aa86731f7416c8739f206d0c5eca52e2a6d3c827.tar.gz
emacs-aa86731f7416c8739f206d0c5eca52e2a6d3c827.zip
* intervals.c (interval_deletion_adjustment): Return unsigned value.
All uses changed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/intervals.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b72f17ab7b9..9bd13eaeb7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
12011-04-04 Paul Eggert <eggert@cs.ucla.edu> 12011-04-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * intervals.c (graft_intervals_into_buffer): Mark var as used. 3 * intervals.c (graft_intervals_into_buffer): Mark var as used.
4 (interval_deletion_adjustment): Return unsigned value.
5 All uses changed.
4 6
5 * process.c (list_processes_1, create_pty, read_process_output): 7 * process.c (list_processes_1, create_pty, read_process_output):
6 (exec_sentinel): Remove vars that were set but not used. 8 (exec_sentinel): Remove vars that were set but not used.
diff --git a/src/intervals.c b/src/intervals.c
index 92c84554510..729e6810f74 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1312,7 +1312,7 @@ delete_interval (register INTERVAL i)
1312 Do this by recursing down TREE to the interval in question, and 1312 Do this by recursing down TREE to the interval in question, and
1313 deleting the appropriate amount of text. */ 1313 deleting the appropriate amount of text. */
1314 1314
1315static EMACS_INT 1315static EMACS_UINT
1316interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from, 1316interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
1317 register EMACS_INT amount) 1317 register EMACS_INT amount)
1318{ 1318{
@@ -1324,7 +1324,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
1324 /* Left branch */ 1324 /* Left branch */
1325 if (relative_position < LEFT_TOTAL_LENGTH (tree)) 1325 if (relative_position < LEFT_TOTAL_LENGTH (tree))
1326 { 1326 {
1327 EMACS_INT subtract = interval_deletion_adjustment (tree->left, 1327 EMACS_UINT subtract = interval_deletion_adjustment (tree->left,
1328 relative_position, 1328 relative_position,
1329 amount); 1329 amount);
1330 tree->total_length -= subtract; 1330 tree->total_length -= subtract;
@@ -1335,7 +1335,7 @@ interval_deletion_adjustment (register INTERVAL tree, register EMACS_INT from,
1335 else if (relative_position >= (TOTAL_LENGTH (tree) 1335 else if (relative_position >= (TOTAL_LENGTH (tree)
1336 - RIGHT_TOTAL_LENGTH (tree))) 1336 - RIGHT_TOTAL_LENGTH (tree)))
1337 { 1337 {
1338 EMACS_INT subtract; 1338 EMACS_UINT subtract;
1339 1339
1340 relative_position -= (tree->total_length 1340 relative_position -= (tree->total_length
1341 - RIGHT_TOTAL_LENGTH (tree)); 1341 - RIGHT_TOTAL_LENGTH (tree));
@@ -1377,7 +1377,7 @@ static void
1377adjust_intervals_for_deletion (struct buffer *buffer, 1377adjust_intervals_for_deletion (struct buffer *buffer,
1378 EMACS_INT start, EMACS_INT length) 1378 EMACS_INT start, EMACS_INT length)
1379{ 1379{
1380 register EMACS_INT left_to_delete = length; 1380 register EMACS_UINT left_to_delete = length;
1381 register INTERVAL tree = BUF_INTERVALS (buffer); 1381 register INTERVAL tree = BUF_INTERVALS (buffer);
1382 Lisp_Object parent; 1382 Lisp_Object parent;
1383 EMACS_INT offset; 1383 EMACS_INT offset;