summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-01 21:50:21 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-01 21:50:21 +0100
commit23fa81d2223cd9bb7c51829c48047b2976bc2d11 (patch)
tree0c4eede5ad33269734bbbf3085762c9d197844f3
parent04e87b72c5fa88b7034a5b0ec0be6a7ad763e9d2 (diff)
downloadvim-git-23fa81d2223cd9bb7c51829c48047b2976bc2d11.tar.gz
patch 8.0.0291: Visual block insertion does not insert in all linesv8.0.0291
Problem: Visual block insertion does not insert in all lines. Solution: Don't bail out of insert too early. Add a test. (Christian Brabandt, closes #1290)
-rw-r--r--src/ops.c3
-rw-r--r--src/testdir/test_visual.vim13
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 2 deletions
diff --git a/src/ops.c b/src/ops.c
index 0a489126c..1c0276d8d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2571,8 +2571,7 @@ op_insert(oparg_T *oap, long count1)
}
t1 = oap->start;
- if (edit(NUL, FALSE, (linenr_T)count1))
- return;
+ (void)edit(NUL, FALSE, (linenr_T)count1);
/* When a tab was inserted, and the characters in front of the tab
* have been converted to a tab as well, the column of the cursor
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index d84a14062..8768395ba 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -23,3 +23,16 @@ func Test_dotregister_paste()
call assert_equal('hello world world', getline(1))
q!
endfunc
+
+func Test_Visual_ctrl_o()
+ new
+ call setline(1, ['one', 'two', 'three'])
+ call cursor(1,2)
+ set noshowmode
+ set tw=0
+ call feedkeys("\<c-v>jjlIa\<c-\>\<c-o>:set tw=88\<cr>\<esc>", 'tx')
+ call assert_equal(['oane', 'tawo', 'tahree'], getline(1, 3))
+ call assert_equal(88, &tw)
+ set tw&
+ bw!
+endfu
diff --git a/src/version.c b/src/version.c
index c1b998bdf..3316a0a67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 291,
+/**/
290,
/**/
289,