From 6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc Mon Sep 17 00:00:00 2001
From: prollings <patrickrollings@gmail.com>
Date: Wed, 6 Jul 2016 23:13:48 +1000
Subject: vim-patch:7.4.1111 (#5004)

Problem:    test_expand fails on MS-Windows.
Solution:   Always use forward slashes.  Remove references to test27.

https://github.com/vim/vim/commit/f60b796fa9870bdfc4cdeb91653bac041916077d
---
 src/nvim/testdir/runtest.vim | 3 +++
 src/nvim/version.c           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 578d64efde..1b1f5d7688 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -39,6 +39,9 @@ set nomore
 " Output all messages in English.
 lang mess C
 
+" Always use forward slashes.
+set shellslash
+
 " Source the test script.  First grab the file name, in case the script
 " navigates away.
 let testname = expand('%')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 36f2b51ac2..278255c904 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -584,7 +584,7 @@ static int included_patches[] = {
   1114,
   1113,
   1112,
-  // 1111,
+  1111,
   1110,
   // 1109 NA
   1108,
-- 
cgit