diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-04-22 15:45:05 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-04-22 15:45:05 +0000 |
commit | 92a990ba84e012033f881fd4a0bebad02933ac75 (patch) | |
tree | 4651008b65175748b95688ed1640184731540454 | |
parent | fe81d45db462f03eb32b2e100bcb3837e61547de (diff) |
updated for version 7.2-158v7.2.158
-rw-r--r-- | src/ops.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -495,10 +495,11 @@ shift_block(oap, amount) block_space_width = non_white_col - oap->start_vcol; /* We will shift by "total" or "block_space_width", whichever is less. */ - shift_amount = (block_space_width < total? block_space_width: total); + shift_amount = (block_space_width < (size_t)total + ? block_space_width : (size_t)total); /* The column to which we will shift the text. */ - destination_col = non_white_col - shift_amount; + destination_col = (colnr_T)(non_white_col - shift_amount); /* Now let's find out how much of the beginning of the line we can * reuse without modification. */ diff --git a/src/version.c b/src/version.c index 9832d5597f..e5e1307fc7 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 158, +/**/ 157, /**/ 156, |