From 9d5b876d458e242b8b5e44da10c5cdc6bbb7f57c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 4 Aug 2016 21:21:13 +0200
Subject: [PATCH] patch 7.4.2155 Problem:    Quotes make GUI test fail on
 MS-Windows. Solution:   Remove quotes, strip white space.

---
 src/testdir/test_gui.vim | 4 ++--
 src/version.c            | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index cd698e37a..d56015cea 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -21,8 +21,8 @@ endfunc
 
 func Test_shell_command()
   new
-  r !echo 'hello'
-  call assert_equal('hello', getline(2))
+  r !echo hello
+  call assert_equal('hello', substitute(getline(2), '\W', '', 'g'))
   bwipe!
   call assert_true(1, match(execute('winpos'), 'Window position: X \d\+, Y \d\+') >= 0)
 endfunc
diff --git a/src/version.c b/src/version.c
index c99fff65d..a4392eb1e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2155,
 /**/
     2154,
 /**/
-- 
2.50.1