summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-16 22:38:00 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-16 22:38:00 +0100
commitc537947100d4a73754ad4b4c9228c6c439655e5d (patch)
tree1fb97de2a7dc94f6f71848c08085d6378a48270c
parent0529b3eb01fcfd18c0644f8ece9ea107dd460a0f (diff)
downloadvim-git-8.0.0472.tar.gz
patch 8.0.0472: when a test fails another test may also failv8.0.0472
Problem: When a test fails and test.log is created, Test_edit_CTRL_I matches it instead of test1.in. Solution: Match with runtest.vim instead.
-rw-r--r--src/testdir/test_edit.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 086e2e458..344c12664 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -506,8 +506,8 @@ func! Test_edit_CTRL_I()
let path=expand("%:p:h")
new
call setline(1, [path."/", ''])
- call feedkeys("Ate\<c-x>\<c-f>\<tab>\<cr>\<esc>", 'tnix')
- call assert_match('test1\.in', getline(1))
+ call feedkeys("Arunt\<c-x>\<c-f>\<tab>\<cr>\<esc>", 'tnix')
+ call assert_match('runtest\.vim', getline(1))
%d
call writefile(['one', 'two', 'three'], 'Xinclude.txt')
let include='#include Xinclude.txt'
diff --git a/src/version.c b/src/version.c
index 3f51e5a42..e4a40f20f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 472,
+/**/
471,
/**/
470,