From 321481299757cdd43baeed33f4c5ba543fdfc7f7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Mar 2021 13:23:30 +0100
Subject: 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)
---
 src/testdir/test_startup.vim | 4 +++-
 src/version.c                | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index e8be19120..169c21350 100644
--- 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 9d46da68c..ef2f0cb31 100644
--- 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,
 /**/
-- 
cgit v1.2.1