From: Bram Moolenaar Date: Sun, 14 Jul 2019 15:26:46 +0000 (+0200) Subject: patch 8.1.1691: diff test fails on some systems X-Git-Tag: v8.1.1691 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37d9f175a4ab885052583746982d6bbfbe0095b9;p=thirdparty%2Fvim.git patch 8.1.1691: diff test fails on some systems Problem: Diff test fails on some systems. (Elimar Riesebieter) Solution: Add a term_wait() call. --- diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index bf49740777..f82a11c925 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -743,6 +743,7 @@ func VerifyInternal(buf, dumpfile, extra) call term_sendkeys(a:buf, ":diffupdate!\") " trailing : for leaving the cursor on the command line call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\:") + call term_wait(a:buf) call VerifyScreenDump(a:buf, a:dumpfile, {}) endfunc diff --git a/src/version.c b/src/version.c index 0c56f7d76b..cc6dc449eb 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1691, /**/ 1690, /**/