summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index f88cba004f..f2c0d17fce 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -253,9 +253,9 @@ endfunc
func Test_communicate_ipv6()
CheckIPv6
- " FIXME: this test is very flaky on MS-Windows with the GUI
- if has('gui_running') && has('win32')
- throw 'Skipped: test is very flaky with MS-Windows in GUI'
+ " FIXME: this test is very flaky on MS-Windows
+ if has('win32')
+ throw 'Skipped: test is very flaky with MS-Windows'
endif
call Test_communicate()
diff --git a/src/version.c b/src/version.c
index a17fa0f220..0ad55115b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3140,
+/**/
3139,
/**/
3138,