diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-21 14:40:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-21 14:40:04 +0100 |
| commit | cafaa8a9502f64d5c23e51c1f89c5b322deb22fe (patch) | |
| tree | 0ab118586f27f7a220ef093898d09926e67b8153 | |
| parent | d07c6e1e82d4321da0fb11ff408aeaeb9fba1f68 (diff) | |
| download | vim-git-cafaa8a9502f64d5c23e51c1f89c5b322deb22fe.tar.gz | |
updated for version 7.4.099v7.4.099
Problem: Append in blockwise Visual mode with "$" is wrong.
Solution: After "$" don't use the code that checks if the cursor was moved.
(Hirohito Higashi, Ken Takata)
| -rw-r--r-- | src/ops.c | 2 | ||||
| -rw-r--r-- | src/testdir/test39.in | 21 | ||||
| -rw-r--r-- | src/testdir/test39.ok | bin | 377 -> 420 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 24 insertions, 1 deletions
@@ -2643,7 +2643,7 @@ op_insert(oap, count1) /* The user may have moved the cursor before inserting something, try * to adjust the block for that. */ - if (oap->start.lnum == curbuf->b_op_start.lnum) + if (oap->start.lnum == curbuf->b_op_start.lnum && !bd.is_MAX) { if (oap->op_type == OP_INSERT && oap->start.col != curbuf->b_op_start.col) diff --git a/src/testdir/test39.in b/src/testdir/test39.in index 77e2bd768..4f42a13a5 100644 --- a/src/testdir/test39.in +++ b/src/testdir/test39.in @@ -23,6 +23,18 @@ G$khhhhhkkcmno /^aaaa/ :exe ":norm! l\<C-V>jjjlllI\<Right>\<Right> \<Esc>" :/^aa/,/^$/w >> test.out +:" Test for Visual block was created with the last <C-v>$ +/^A23$/ +:exe ":norm! l\<C-V>j$Aab\<Esc>" +:.,/^$/w >> test.out +:" Test for Visual block was created with the middle <C-v>$ (1) +/^B23$/ +:exe ":norm! l\<C-V>j$hAab\<Esc>" +:.,/^$/w >> test.out +:" Test for Visual block was created with the middle <C-v>$ (2) +/^C23$/ +:exe ":norm! l\<C-V>j$hhAab\<Esc>" +:.,/^$/w >> test.out :" gUe must uppercase a whole word, also when ß changes to SS Gothe youtußeuu endYpk0wgUe :" gUfx must uppercase until x, inclusive. @@ -49,6 +61,15 @@ bbbbbb cccccc dddddd +A23 +4567 + +B23 +4567 + +C23 +4567 + abcdefghijklm abcdefghijklm abcdefghijklm diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok Binary files differindex 4964d6a34..3469f52b6 100644 --- a/src/testdir/test39.ok +++ b/src/testdir/test39.ok diff --git a/src/version.c b/src/version.c index 505e227f9..7f9ae8b7e 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 99, +/**/ 98, /**/ 97, |