summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-22 23:24:13 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-22 23:24:13 +0200
commit0f6629a08a9ae482956f5e70452ae78be569eadf (patch)
tree8a2069f0dc7c64af915c89835341e013e2265dbb
parent513537bfff59b94a26c63ab2bd458f21d4be774e (diff)
patch 8.1.2069: test for SafeStateAgain may still failv8.1.2069
Problem: Test for SafeStateAgain may still fail. Solution: Send another message to trigger SafeStateAgain.
-rw-r--r--src/testdir/test_autocmd.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 1f901a9ffa..f2c9af50f8 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2250,7 +2250,9 @@ func Test_autocmd_SafeState()
call WaitForAssert({-> assert_match('^xxxx', 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)
+ call term_sendkeys(buf, ":\<CR>")
+ call term_wait(buf)
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 678bc13d40..bfe483e28a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2069,
+/**/
2068,
/**/
2067,