aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-05-10 20:58:49 +0200
committerJurica Bradaric <jbradaric@gmail.com>2016-05-10 20:59:32 +0200
commit1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7 (patch)
treeea1fe7806fbf755628725fbf54a3c07820cab6f4
parent6e9e5d23ce3e295f732b28fb1e9281fcc830b118 (diff)
downloadrneovim-1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7.tar.gz
rneovim-1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7.tar.bz2
rneovim-1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7.zip
vim-patch:7.4.1049
Problem: Wordcount test still still fails on MS-Windows. Solution: Set 'fileformats' to "unix". https://github.com/vim/vim/commit/485dace817a99f4cf92a598845d27c8ee685df93
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/wordcount_spec.lua2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b442a0a903..76b6115885 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -629,7 +629,7 @@ static int included_patches[] = {
// 1052,
// 1051,
// 1050,
- // 1049,
+ 1049,
1048,
1047,
// 1046,
diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index 64f1fe7851..ba7be8f21b 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -11,6 +11,8 @@ describe('wordcount', function()
it('is working', function()
execute('set selection=inclusive')
execute('fileformat=unix')
+ execute('fileformats=unix')
+
insert([=[
RESULT test:]=])