Merge pull request #4729 from jbradaric/vim-7.4.1047

vim-patch 7.4.1047, 7.4.1048, 7.4.1049

src/nvim/version.c

@@ -633,9 +633,9 @@ static int included_patches[] = {
   1052,
   // 1051,
   // 1050,
-  // 1049,
-  // 1048,
-  // 1047,
+  1049,
+  1048,
+  1047,
   // 1046,
   // 1045 NA
   // 1044 NA

test/functional/legacy/wordcount_spec.lua

@@ -9,6 +9,10 @@ describe('wordcount', function()
   before_each(clear)
 
   it('is working', function()
+    execute('set selection=inclusive')
+    execute('fileformat=unix')
+    execute('fileformats=unix')
+
     insert([=[
       RESULT test:]=])