From: Bram Moolenaar Date: Tue, 1 May 2018 14:26:48 +0000 (+0200) Subject: patch 8.0.1784: gvim test gets stuck in dialog X-Git-Tag: v8.0.1784 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc7845da935c0707e119812077cecd6cfb5a65e2;p=thirdparty%2Fvim.git patch 8.0.1784: gvim test gets stuck in dialog Problem: Gvim test gets stuck in dialog. Solution: Rename the file used. --- diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 559958b7e1..7cc4ae5576 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1154,18 +1154,18 @@ func Test_efm2() " Test for %o set efm=%f(%o):%l\ %m - cgetexpr ['Xtestfile(Language.PureScript.Types):20 Error'] - call writefile(['Line1'], 'Xtestfile') + cgetexpr ['Xotestfile(Language.PureScript.Types):20 Error'] + call writefile(['Line1'], 'Xotestfile') let l = getqflist() call assert_equal(1, len(l), string(l)) call assert_equal('Language.PureScript.Types', l[0].module) copen call assert_equal('Language.PureScript.Types|20| Error', getline(1)) call feedkeys("\", 'xn') - call assert_equal('Xtestfile', expand('%:t')) + call assert_equal('Xotestfile', expand('%:t')) cclose bd - call delete("Xtestfile") + call delete("Xotestfile") " The following sequence of commands used to crash Vim set efm=%W%m diff --git a/src/version.c b/src/version.c index 76a4f2c372..16d0eb0fda 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1784, /**/ 1783, /**/