patch 7.4.818
Problem: 'linebreak' breaks c% if the last Visual selection was block.
(Chris Morganiser, Issue 389)
Solution: Handle Visual block mode differently. (Christian Brabandt)
diff --git a/src/normal.c b/src/normal.c
index 309b895..a46cc9d 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -9583,20 +9583,21 @@
#endif
/*
- * calculate start/end virtual columns for operating in block mode
+ * Calculate start/end virtual columns for operating in block mode.
*/
static void
get_op_vcol(oap, redo_VIsual_vcol, initial)
oparg_T *oap;
colnr_T redo_VIsual_vcol;
- int initial; /* when true: adjust position for 'selectmode' */
+ int initial; /* when TRUE adjust position for 'selectmode' */
{
colnr_T start, end;
- if (VIsual_mode != Ctrl_V)
+ if (VIsual_mode != Ctrl_V
+ || (!initial && oap->end.col < W_WIDTH(curwin)))
return;
- oap->block_mode = TRUE;
+ oap->block_mode = VIsual_active;
#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 164f12a..e5372d4 100644
--- a/src/testdir/test_listlbr.in
+++ b/src/testdir/test_listlbr.in
@@ -80,6 +80,13 @@
aaa
aaa
a2k2j~e.
+:let g:test ="Test 10: using normal commands after block-visual"
+:$put =g:test
+:set linebreak
+Go
+abcd{ef
+ghijklm
+no}pqrs2k0f{c%
:%w! test.out
:qa!
ENDTEST
diff --git a/src/testdir/test_listlbr.ok b/src/testdir/test_listlbr.ok
index 323bcde..295a9f7 100644
--- a/src/testdir/test_listlbr.ok
+++ b/src/testdir/test_listlbr.ok
@@ -46,3 +46,6 @@
AaA
AaA
A
+Test 10: using normal commands after block-visual
+
+abcdpqrs
diff --git a/src/version.c b/src/version.c
index 177b591..0f48bae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 818,
+/**/
817,
/**/
816,