To: vim_dev@googlegroups.com
Subject: Patch 8.1.2068
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.2068 (after 8.1.2067)
Problem:    Test for SafeState and SafeStateAgain may fail.
Solution:   Accept more possible responses
Files:	    src/testdir/test_autocmd.vim


*** ../vim-8.1.2067/src/testdir/test_autocmd.vim	2019-09-22 21:50:05.962274920 +0200
--- src/testdir/test_autocmd.vim	2019-09-22 23:02:33.035757147 +0200
***************
*** 2242,2255 ****
    call writefile(lines, 'XSafeState')
    let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
  
    call term_sendkeys(buf, ":echo g:safe\<CR>")
!   call WaitForAssert({-> assert_match('^2 ', 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_sendkeys(buf, ":echo g:again\<CR>")
    call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
  
--- 2242,2256 ----
    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('^[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, 50)
    call term_sendkeys(buf, ":echo g:again\<CR>")
    call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
  
*** ../vim-8.1.2067/src/version.c	2019-09-22 21:50:05.962274920 +0200
--- src/version.c	2019-09-22 23:03:37.455478105 +0200
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     2068,
  /**/

-- 
You had connectors?  Eeee, when I were a lad we 'ad to carry the
bits between the computer and the terminal with a spoon...

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///