aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-05-10 20:54:51 +0200
committerJurica Bradaric <jbradaric@gmail.com>2016-05-10 20:57:32 +0200
commitae7500457e13ca89c31884fa506194f0f330f89a (patch)
tree131b4fa8e7d5d433b3222d93af3380646927ae11
parent0bfc1f33a02e2ea405a2df7eee67f093b56fa997 (diff)
downloadrneovim-ae7500457e13ca89c31884fa506194f0f330f89a.tar.gz
rneovim-ae7500457e13ca89c31884fa506194f0f330f89a.tar.bz2
rneovim-ae7500457e13ca89c31884fa506194f0f330f89a.zip
vim-patch:7.4.1047
Problem: Tests fail on MS-Windows. Solution: Set 'selection' to inclusive. https://github.com/vim/vim/commit/7f68203168aeb22fcf8a5a9680503fe16759ebd4
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/wordcount_spec.lua1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 81137ff1c6..688b39def5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -631,7 +631,7 @@ static int included_patches[] = {
// 1050,
// 1049,
// 1048,
- // 1047,
+ 1047,
// 1046,
// 1045 NA
// 1044 NA
diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index 63787a59d3..a1efbdc893 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -9,6 +9,7 @@ describe('wordcount', function()
before_each(clear)
it('is working', function()
+ execute('set selection=inclusive')
insert([=[
RESULT test:]=])