patch 8.2.2609: test disabled on MS-Windows even though it should work

Problem:    Test disabled on MS-Windows even though it should work.
Solution:   Restore the condition for skipping the test. (Ken Takata,
            closes #7970)

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index e8be19120b64681354df12c2ddd7c9349c83efa1..169c21350efb8a14a0d623c0c2bdb32f44cfe6ab 100644 (file)
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -109,7 +109,9 @@ func Test_pack_in_rtp_when_plugins_run()
 endfunc
 
 func Test_help_arg()
-  CheckNotMSWindows
+  if !has('unix') && has('gui_running')
+    throw 'Skipped: does not work with gvim on MS-Windows'
+  endif
 
   if RunVim([], [], '--help >Xtestout')
     let lines = readfile('Xtestout')

diff --git a/src/version.c b/src/version.c
index 9d46da68ccdd5315efa2c79eab8448856dd30de4..ef2f0cb31e81d05b8d5053416d33a841efc7d763 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2609,
 /**/
     2608,
 /**/