From 1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7 Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Tue, 10 May 2016 20:58:49 +0200 Subject: [PATCH] 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:]=])