# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1569186903 -7200
# Node ID 591db862249aae8f68c3be8227f13a3d4ea6d8f6
# Parent  2923095ca100d80b2d2e29cd5c2e05013d0fa881
patch 8.1.2068: test for SafeState and SafeStateAgain may fail

Commit: https://github.com/vim/vim/commit/513537bfff59b94a26c63ab2bd458f21d4be774e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Sep 22 23:03:58 2019 +0200

    patch 8.1.2068: test for SafeState and SafeStateAgain may fail

    Problem:    Test for SafeState and SafeStateAgain may fail.
    Solution:   Accept more possible responses

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2242,14 +2242,15 @@ func Test_autocmd_SafeState()
   call writefile(lines, 'XSafeState')
   let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
 
+  " Sometimes we loop to handle an K_IGNORE
   call term_sendkeys(buf, ":echo g:safe\<CR>")
-  call WaitForAssert({-> assert_match('^2 ', term_getline(buf, 6))}, 1000)
+  call WaitForAssert({-> assert_match('^[12] ', term_getline(buf, 6))}, 1000)
 
   call term_sendkeys(buf, ":echo g:again\<CR>")
   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)
+  call term_wait(buf, 50)
   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
--- 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 */
 /**/
+    2068,
+/**/
     2067,
 /**/
     2066,