From: Bram Moolenaar Date: Sat, 6 Aug 2016 21:03:59 +0000 (+0200) Subject: patch 7.4.2173 X-Git-Tag: v7.4.2173 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3321e9d8a36c91c62d8ba3d43430b5c213b87f8b;p=vim patch 7.4.2173 Problem: Can't test help on MS-Windows. Solution: Skip the test. --- diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index d2463f476..f21f4c35b 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -62,6 +62,10 @@ func Test_after_comes_later() endfunc func Test_help_arg() + if !has('unix') && has('gui') + " this doesn't work with gvim on MS-Windows + return + endif if RunVim([], [], '--help >Xtestout') let lines = readfile('Xtestout') call assert_true(len(lines) > 20) diff --git a/src/version.c b/src/version.c index a7af2939f..9cf031bdf 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 */ +/**/ + 2173, /**/ 2172, /**/