summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-18 11:54:47 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-18 11:54:47 +0100
commit8d6420631c2bd73dbc1939c4bf04ab7bb39cc263 (patch)
tree98c38e0331ddd1a4c91845056b7c539855a23d43
parent2f074f4685897ab7212e25931eeeb0212292829f (diff)
patch 8.2.5121: interrupt test sometimes failsv8.2.5121
Problem: Interrupt test sometimes fails. Solution: Use a different file name.
-rw-r--r--src/testdir/test_interrupt.vim11
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/testdir/test_interrupt.vim b/src/testdir/test_interrupt.vim
index 21ff097884..aa7f634302 100644
--- a/src/testdir/test_interrupt.vim
+++ b/src/testdir/test_interrupt.vim
@@ -13,17 +13,20 @@ func s:bufwritepost()
endfunction
func Test_interrupt()
- new Xfile
+ new Xinterrupt
let n = 0
try
- au BufWritePre Xfile call s:bufwritepre()
- au BufWritePost Xfile call s:bufwritepost()
+ au BufWritePre Xinterrupt call s:bufwritepre()
+ au BufWritePost Xinterrupt call s:bufwritepost()
w!
catch /^Vim:Interrupt$/
endtry
call assert_equal(1, s:bufwritepre_called)
call assert_equal(0, s:bufwritepost_called)
- call assert_equal(0, filereadable('Xfile'))
+ call assert_equal(0, filereadable('Xinterrupt'))
+
+ au! BufWritePre
+ au! BufWritePost
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index df9d576ad4..89e1fa1b7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5121,
+/**/
5120,
/**/
5119,