patch 7.4.883

Problem:    Block-mode replace works characterwise instead of blockwise after
            column 147. (Issue #422)
Solution:   Set Visual mode. (Christian Brabandt)

diff --git a/src/normal.c b/src/normal.c
index 69b0dcecbed5b601782d1a2780bb1093e3c6ad33..b994056e653486e22815a456e5214dee35cbb2bd 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -9596,7 +9596,7 @@ get_op_vcol(oap, redo_VIsual_vcol, initial)
            || (!initial && oap->end.col < W_WIDTH(curwin)))
        return;
 
-    oap->block_mode = VIsual_active;
+    oap->block_mode = TRUE;
 
 #ifdef FEAT_MBYTE
     /* prevent from moving onto a trail byte */

diff --git a/src/testdir/test_listlbr.in b/src/testdir/test_listlbr.in
index e5372d4de1fac6ddad446255fe094e1f3e7c6867..52cbc100cb9e06c66d051acfc03cf45f91950723 100644 (file)
--- a/src/testdir/test_listlbr.in
+++ b/src/testdir/test_listlbr.in
@@ -87,6 +87,10 @@ Go
 abcd{ef
 ghijklm
 no}pqrs\e2k0f{\16\16c%\e
+:let g:test ="Test 11: using block replace mode after wrapping"
+:$put =g:test
+:set linebreak wrap
+Go\e150aa\eyypk147|\16jr0
 :%w! test.out
 :qa!
 ENDTEST

diff --git a/src/testdir/test_listlbr.ok b/src/testdir/test_listlbr.ok
index 295a9f737857c4552ee2addf2854be1e40d12778..ff30b46ee8454c62bf0e0ff84b452a02d0b677a5 100644 (file)
--- a/src/testdir/test_listlbr.ok
+++ b/src/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/version.c b/src/version.c
index 586ce19c98768f12d152be4f469ba893eea9b278..38fdf93bd11c5570c9b2415f2c9563195de61fa3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    883,
 /**/
     882,
 /**/