From: Bram Moolenaar Date: Wed, 12 Oct 2016 15:52:42 +0000 (+0200) Subject: patch 8.0.0032 X-Git-Tag: v8.0.0032 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e8474dd50f64c998bb665ce852f584a58dede6b;p=vim patch 8.0.0032 Problem: Tests may change the input file when something goes wrong. Solution: Avoid writing the input file. --- diff --git a/src/testdir/test51.in b/src/testdir/test51.in index b4f45d1f7..b66befb05 100644 --- a/src/testdir/test51.in +++ b/src/testdir/test51.in @@ -24,7 +24,7 @@ STARTTEST :hi Crash term='asdf :redir END :" filter ctermfg and ctermbg, the numbers depend on the terminal -:e test.out +:e! test.out :%s/ctermfg=\d*/ctermfg=2/ :%s/ctermbg=\d*/ctermbg=3/ :" filter out possibly translated error message diff --git a/src/testdir/test67.in b/src/testdir/test67.in index 08b4e3701..e40cbabd6 100644 --- a/src/testdir/test67.in +++ b/src/testdir/test67.in @@ -24,7 +24,7 @@ STARTTEST :call add(results, "#BufEnter#: " . exists("#BufEnter#")) :edit testfile2.test :call add(results, "#BufEnter#: " . exists("#BufEnter#")) -:e test.out +:e! test.out :call append(0, results) :$d :w diff --git a/src/testdir/test97.in b/src/testdir/test97.in index d4ff6d929..5a4cb1e17 100644 --- a/src/testdir/test97.in +++ b/src/testdir/test97.in @@ -7,7 +7,7 @@ STARTTEST :set shell=doesnotexist :" consistent sorting of file names :set nofileignorecase -:e test.out +:e! test.out :$put =glob('Xxx\{') :$put =glob('Xxx\$') :w! Xxx{ diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 4bee7956d..3f69fb919 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -11,6 +11,7 @@ function Test_tabpage() 0tabnew 1tabnew $tabnew + %del tabdo call append(line('$'), tabpagenr()) tabclose! 2 tabrewind diff --git a/src/version.c b/src/version.c index 39662f63e..6fee4abf7 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 32, /**/ 31, /**/