aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.1.1691: diff test fails on some systems

Browse Source 
Problem:    Diff test fails on some systems. (Elimar Riesebieter)
Solution:   Add a term_wait() call.
This commit is contained in:
Bram Moolenaar
2019-07-14 17:26:46 +02:00
parent 0346413c24
commit 37d9f175a4
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/test_diffmode.vim
View File

@@ -743,6 +743,7 @@ func VerifyInternal(buf, dumpfile, extra)
call term_sendkeys(a:buf, ":diffupdate!\<CR>") call term_sendkeys(a:buf, ":diffupdate!\<CR>")
" trailing : for leaving the cursor on the command line " trailing : for leaving the cursor on the command line
call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\<CR>:") call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\<CR>:")
call term_wait(a:buf)
call VerifyScreenDump(a:buf, a:dumpfile, {}) call VerifyScreenDump(a:buf, a:dumpfile, {})
endfunc endfunc

2
src/version.c
View File

@@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1691,
/**/ /**/
1690, 1690,
/**/ /**/