summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_autocmd.vim12
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 5 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 2ff231d36..8a1d5d835 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2245,17 +2245,19 @@ func Test_autocmd_SafeState()
call writefile(lines, 'XSafeState')
let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
- " Sometimes we loop to handle an K_IGNORE
+ " Sometimes we loop to handle a K_IGNORE, SafeState may be trigered once or
+ " more often.
call term_sendkeys(buf, ":echo g:safe\<CR>")
- call WaitForAssert({-> assert_match('^[12] ', term_getline(buf, 6))}, 1000)
+ call WaitForAssert({-> assert_match('^\d ', term_getline(buf, 6))}, 1000)
+ " SafeStateAgain should be invoked at least three times
call term_sendkeys(buf, ":echo g:again\<CR>")
- call WaitForAssert({-> assert_match('^xxxx', term_getline(buf, 6))}, 1000)
+ call WaitForAssert({-> assert_match('^xxx', term_getline(buf, 6))}, 1000)
call term_sendkeys(buf, ":let g:again = ''\<CR>:call CallTimer()\<CR>")
- call term_wait(buf, 50)
+ call term_wait(buf, 100)
call term_sendkeys(buf, ":\<CR>")
- call term_wait(buf, 50)
+ call term_wait(buf, 100)
call term_sendkeys(buf, ":echo g:again\<CR>")
call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
diff --git a/src/version.c b/src/version.c
index b8e47fc56..61ee30c92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 310,
+/**/
309,
/**/
308,