patch 8.2.3480: test does not fail without the fix for a crash
Problem: Test does not fail without the fix for a crash.
Solution: Write the bad code in a file and source it. (Dominique Pellé,
closes #8961)
diff --git a/src/testdir/test_trycatch.vim b/src/testdir/test_trycatch.vim
index ac12671..4b8f7ef 100644
--- a/src/testdir/test_trycatch.vim
+++ b/src/testdir/test_trycatch.vim
@@ -2274,17 +2274,26 @@
endfunc
func ThisWillFail()
- try
- if x | endif
- catch
- for l in []
- finally
+
endfunc
+" This was crashing prior to the fix in 8.2.3478.
func Test_error_in_catch_and_finally()
- call assert_fails('call ThisWillFail()', ['E121:', 'E600:'])
-endfunc
+ let lines =<< trim END
+ try
+ echo x
+ catch
+ for l in []
+ finally
+ END
+ call writefile(lines, 'XtestCatchAndFinally')
+ try
+ source XtestCatchAndFinally
+ catch /E600:/
+ endtry
+ call delete('XtestCatchAndFinally')
+endfunc
" Modeline {{{1
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 96e7606..70f363a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3480,
+/**/
3479,
/**/
3478,