summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-25 19:35:02 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-25 19:35:02 +0200
commit10ad1d90da8c464e1bf08bf23d92d4888378a8a1 (patch)
treec3e40aa76fa03c8197afa28aa4258cb3835c61db
parent5f1fea28f5bc573e2430773c49e95ae1f9cc2a25 (diff)
patch 7.4.883v7.4.883
Problem: Block-mode replace works characterwise instead of blockwise after column 147. (Issue #422) Solution: Set Visual mode. (Christian Brabandt)
-rw-r--r--src/normal.c2
-rw-r--r--src/testdir/test_listlbr.in4
-rw-r--r--src/testdir/test_listlbr.ok3
-rw-r--r--src/version.c2
4 files changed, 10 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index 69b0dcecbe..b994056e65 100644
--- 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 e5372d4de1..52cbc100cb 100644
--- a/src/testdir/test_listlbr.in
+++ b/src/testdir/test_listlbr.in
@@ -87,6 +87,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/testdir/test_listlbr.ok b/src/testdir/test_listlbr.ok
index 295a9f7378..ff30b46ee8 100644
--- 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 586ce19c98..38fdf93bd1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 883,
+/**/
882,
/**/
881,
/* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
[submodule "mqtt_websockets"]
	path = mqtt_websockets
	url = https://github.com/underhood/mqtt_websockets.git
[submodule "aclk/aclk-schemas"]
	path = aclk/aclk-schemas
	url = https://github.com/netdata/aclk-schemas.git
[submodule "ml/kmeans/dlib"]
	path = ml/kmeans/dlib
	url = https://github.com/davisking/dlib.git
	shallow = true
	ignore = dirty
[submodule "ml/json"]
	path = ml/json
	url = https://github.com/nlohmann/json.git
	shallow = true