summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/runtest.vim2
-rw-r--r--src/testdir/test_channel.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index e06e0cbdf9..7f77692886 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -125,7 +125,7 @@ else
endif
" Names of flaky tests.
-let s:flaky = ['Test_reltime()']
+let s:flaky = ['Test_reltime()', 'Test_nb_basic()']
" Locate Test_ functions and execute them.
set nomore
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index e00cc502b5..48ab69c75b 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1344,4 +1344,4 @@ func Test_close_lambda()
endfunc
" Uncomment this to see what happens, output is in src/testdir/channellog.
- call ch_logfile('channellog', 'w')
+" call ch_logfile('channellog', 'w')
diff --git a/src/version.c b/src/version.c
index 55054968e3..13c6bfed2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2093,
+/**/
2092,
/**/
2091,