patch 7.4.2155

Problem:    Quotes make GUI test fail on MS-Windows.
Solution:   Remove quotes, strip white space.

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index cd698e37af76e0b3d21bf8a2b596169ff8c0a87a..d56015cea3908eed35fd62e42a51956d19838c1f 100644 (file)
--- 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 c99fff65d3523b0e760ca16b392606192bff6515..a4392eb1ea6c44c364544216d5ab239349d01aa4 100644 (file)
--- 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,
 /**/