summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-05-01 16:26:48 +0200
committerBram Moolenaar <Bram@vim.org>2018-05-01 16:26:48 +0200
commitbc7845da935c0707e119812077cecd6cfb5a65e2 (patch)
treeb7f4368045b31ef26328ac3f9a77d3bd9c269323
parentc5cd88554f1e0b2e9ff08d9a0748238dd8340ce1 (diff)
downloadvim-git-bc7845da935c0707e119812077cecd6cfb5a65e2.tar.gz
patch 8.0.1784: gvim test gets stuck in dialogv8.0.1784
Problem: Gvim test gets stuck in dialog. Solution: Rename the file used.
-rw-r--r--src/testdir/test_quickfix.vim8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 559958b7e..7cc4ae557 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("\<CR>", '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 76a4f2c37..16d0eb0fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1784,
+/**/
1783,
/**/
1782,