From ae7500457e13ca89c31884fa506194f0f330f89a Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 10 May 2016 20:54:51 +0200
Subject: [PATCH 1/3] vim-patch:7.4.1047

Problem:    Tests fail on MS-Windows.
Solution:   Set 'selection' to inclusive.

https://github.com/vim/vim/commit/7f68203168aeb22fcf8a5a9680503fe16759ebd4
---
 src/nvim/version.c                        | 2 +-
 test/functional/legacy/wordcount_spec.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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:]=])
 

From 6e9e5d23ce3e295f732b28fb1e9281fcc830b118 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 10 May 2016 20:57:44 +0200
Subject: [PATCH 2/3] vim-patch:7.4.1048

Problem:    Wordcount test still fail on MS-Windows.
Solution:   Set 'fileformat' to "unix".

https://github.com/vim/vim/commit/c7803a1c42228566ee2e2efcd621b21d0a8ed3ea
---
 src/nvim/version.c                        | 2 +-
 test/functional/legacy/wordcount_spec.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 688b39def5..b442a0a903 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -630,7 +630,7 @@ static int included_patches[] = {
   // 1051,
   // 1050,
   // 1049,
-  // 1048,
+  1048,
   1047,
   // 1046,
   // 1045 NA
diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index a1efbdc893..64f1fe7851 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -10,6 +10,7 @@ describe('wordcount', function()
 
   it('is working', function()
     execute('set selection=inclusive')
+    execute('fileformat=unix')
     insert([=[
       RESULT test:]=])
 

From 1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 10 May 2016 20:58:49 +0200
Subject: [PATCH 3/3] 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
---
 src/nvim/version.c                        | 2 +-
 test/functional/legacy/wordcount_spec.lua | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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:]=])