summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_startup.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
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
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2609,
+/**/
2608,
/**/
2607,