summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-08 20:39:15 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-08 20:39:15 +0100
commitac665c24c97582a64ae2d151a812eca92c1ff2d6 (patch)
tree64a449787e972fc1caab80ce90697d7004d8a7ad /src
parent023fd5d21323fe6dffa080bd20c4d39e1212d353 (diff)
patch 8.2.2112: running tests may leave some files behindv8.2.2112
Problem: Running tests may leave some files behind. Solution: Delete the right files. Fix a few typos. (Dominique Pellé, closes #7436
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/testdir/test_messages.vim2
-rw-r--r--src/testdir/test_mksession.vim9
-rw-r--r--src/version.c2
4 files changed, 9 insertions, 6 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 450aae48e9..2415e4da6a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -722,7 +722,7 @@ func Test_ts_file()
call assert_equal('typescript', &filetype)
bwipe!
- call delete('Xfile.hook')
+ call delete('Xfile.ts')
filetype off
endfunc
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 158e94bc5a..4f8c75112f 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -323,7 +323,7 @@ func Test_quit_long_message()
" clean up
call StopVimInTerminal(buf)
- call delete('Xtest_diff_rnu')
+ call delete('Xtest_quit_message')
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index c2b8fb955c..723eb8ed2d 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -381,7 +381,7 @@ func Test_mksession_terminal_no_restore_cmdarg()
let term_cmd = ''
for line in lines
if line =~ '^terminal'
- call assert_report('session must not restore teminal')
+ call assert_report('session must not restore terminal')
endif
endfor
@@ -398,7 +398,7 @@ func Test_mksession_terminal_no_restore_funcarg()
let term_cmd = ''
for line in lines
if line =~ '^terminal'
- call assert_report('session must not restore teminal')
+ call assert_report('session must not restore terminal')
endif
endfor
@@ -416,7 +416,7 @@ func Test_mksession_terminal_no_restore_func()
let term_cmd = ''
for line in lines
if line =~ '^terminal'
- call assert_report('session must not restore teminal')
+ call assert_report('session must not restore terminal')
endif
endfor
@@ -434,7 +434,7 @@ func Test_mksession_terminal_no_ssop()
let term_cmd = ''
for line in lines
if line =~ '^terminal'
- call assert_report('session must not restore teminal')
+ call assert_report('session must not restore terminal')
endif
endfor
@@ -940,6 +940,7 @@ func Test_altfile()
call assert_equal('Xtwoalt', bufname('#'))
only
bwipe!
+ call delete('Xtest_altfile')
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 07dc6a20dc..f4415817bd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2112,
+/**/
2111,
/**/
2110,