summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_search.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 67d29c5d4..794dd1d01 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -333,6 +333,7 @@ endfunc
func Test_searchpair_timeout()
CheckFeature reltime
+ let g:test_is_flaky = 1
func Waitabit()
sleep 20m
@@ -1606,6 +1607,7 @@ func Test_search_errors()
endfunc
func Test_search_timeout()
+ let g:test_is_flaky = 1
new
" use a complicated pattern that should be slow with the BT engine
let pattern = '\%#=1a*.*X\@<=b*'
diff --git a/src/version.c b/src/version.c
index 370c4d06f..5b5b405fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5140,
+/**/
5139,
/**/
5138,