diff options
author | watiko <service@mail.watiko.net> | 2016-02-11 16:42:20 +0900 |
---|---|---|
committer | watiko <service@mail.watiko.net> | 2016-02-11 16:45:08 +0900 |
commit | 8eb0d43c12dc5342b329aaabf1ab7c9cae691bc5 (patch) | |
tree | 113f6f094090f5afc84aedeb1c7afd05903f4f4c | |
parent | 66571f64a46cba1fd54710fd7f59672cd21e2523 (diff) | |
download | rneovim-8eb0d43c12dc5342b329aaabf1ab7c9cae691bc5.tar.gz rneovim-8eb0d43c12dc5342b329aaabf1ab7c9cae691bc5.tar.bz2 rneovim-8eb0d43c12dc5342b329aaabf1ab7c9cae691bc5.zip |
vim-patch:7.4.883
Problem: Block-mode replace works characterwise instead of blockwise after
column 147. (Issue #422)
Solution: Set Visual mode. (Christian Brabandt)
https://github.com/vim/vim/commit/10ad1d90da8c464e1bf08bf23d92d4888378a8a1
-rw-r--r-- | src/nvim/normal.c | 4 | ||||
-rw-r--r-- | src/nvim/testdir/test_listlbr.in | 4 | ||||
-rw-r--r-- | src/nvim/testdir/test_listlbr.ok | 3 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index d4b78b1a79..6d079f967e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -7797,9 +7797,7 @@ static void get_op_vcol( return; } - if (VIsual_active) { - oap->motion_type = MBLOCK; - } + oap->motion_type = MBLOCK; // prevent from moving onto a trail byte if (has_mbyte) { diff --git a/src/nvim/testdir/test_listlbr.in b/src/nvim/testdir/test_listlbr.in index 9bf0086467..9c6f0ca4fc 100644 --- a/src/nvim/testdir/test_listlbr.in +++ b/src/nvim/testdir/test_listlbr.in @@ -88,6 +88,10 @@ Go abcd{ef ghijklm no}pqrs2k0f{c% +:let g:test ="Test 11: using block replace mode after wrapping" +:$put =g:test +:set linebreak wrap +Go150aayypk147|jr0 :%w! test.out :qa! ENDTEST diff --git a/src/nvim/testdir/test_listlbr.ok b/src/nvim/testdir/test_listlbr.ok index 295a9f7378..ff30b46ee8 100644 --- a/src/nvim/testdir/test_listlbr.ok +++ b/src/nvim/testdir/test_listlbr.ok @@ -49,3 +49,6 @@ A Test 10: using normal commands after block-visual abcdpqrs +Test 11: using block replace mode after wrapping +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa diff --git a/src/nvim/version.c b/src/nvim/version.c index 11c2488fa5..1a83adc6ed 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -405,7 +405,7 @@ static int included_patches[] = { // 886 NA // 885, // 884 NA - // 883, + 883, // 882, // 881, // 880 NA |