patch 8.2.4892: test failures because of changed error messages
Problem: Test failures because of changed error messages.
Solution: Adjust the exptected error messages.
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index 4f5bb67..cd537f4 100644
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -141,7 +141,7 @@
if RunVim([], [], '--clean -s Xscript')
call assert_equal([
\ 'E1274: No script file name to substitute for "<script>"',
- \ 'E498: no :source file name to substitute for "<sfile>"'],
+ \ 'E498: No :source file name to substitute for "<sfile>"'],
\ readfile('Xresult'))
endif
call delete('Xscript')
diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim
index a4554bb..bfd7013 100644
--- a/src/testdir/test_tcl.vim
+++ b/src/testdir/test_tcl.vim
@@ -711,7 +711,7 @@
call assert_fails('tcl exit x', 'expected integer but got "x"')
tcl set foo "foo"
- call assert_fails('tcl exit 3', 'E572: exit code 3')
+ call assert_fails('tcl exit 3', 'E572: Exit code 3')
" The Tcl interpreter should have been deleted and a new one
" is re-created with the next :tcl command.
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 36a0ba2..a13e370 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -293,7 +293,7 @@
var ls: list<string> = []
ls[-1] ..= 'foo'
END
- v9.CheckDefExecAndScriptFailure(lines, 'E684: list index out of range: -1', 2)
+ v9.CheckDefExecAndScriptFailure(lines, 'E684: List index out of range: -1', 2)
enddef
def Test_assign_register()
@@ -1641,7 +1641,7 @@
l[g:idx : 1] = [0]
echo l
END
- v9.CheckDefExecAndScriptFailure(lines, 'E684: list index out of range: 3')
+ v9.CheckDefExecAndScriptFailure(lines, 'E684: List index out of range: 3')
lines =<< trim END
var l = [1, 2]
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index b463743..c9334bc 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2157,7 +2157,7 @@
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_getchannel("a")'], ['E1013: Argument 1: type mismatch, expected job but got string', 'E1218: Job required for argument 1'])
- assert_fails('job_getchannel(test_null_job())', 'E916: not a valid job')
+ assert_fails('job_getchannel(test_null_job())', 'E916: Not a valid job')
endif
enddef
@@ -2166,7 +2166,7 @@
CheckFeature job
else
v9.CheckDefAndScriptFailure(['job_info("a")'], ['E1013: Argument 1: type mismatch, expected job but got string', 'E1218: Job required for argument 1'])
- assert_fails('job_info(test_null_job())', 'E916: not a valid job')
+ assert_fails('job_info(test_null_job())', 'E916: Not a valid job')
endif
enddef
@@ -4071,8 +4071,8 @@
assert_equal('AX234', res)
if has('job')
- assert_fails('"text"->substitute(".*", () => test_null_job(), "")', 'E908: using an invalid value as a String: job')
- assert_fails('"text"->substitute(".*", () => test_null_channel(), "")', 'E908: using an invalid value as a String: channel')
+ assert_fails('"text"->substitute(".*", () => test_null_job(), "")', 'E908: Using an invalid value as a String: job')
+ assert_fails('"text"->substitute(".*", () => test_null_channel(), "")', 'E908: Using an invalid value as a String: channel')
endif
v9.CheckDefAndScriptFailure(['substitute(1, "b", "1", "d")'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
v9.CheckDefAndScriptFailure(['substitute("a", 2, "1", "d")'], ['E1013: Argument 2: type mismatch, expected string but got number', 'E1174: String required for argument 2'])
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 729e77a..40d759c 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -3114,7 +3114,7 @@
v9.CheckDefExecAndScriptFailure(['echo g:testblob[2]'], 'E979:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testblob[-3]'], 'E979:', 1)
- v9.CheckDefExecAndScriptFailure(['echo g:testlist[4]'], 'E684: list index out of range: 4', 1)
+ v9.CheckDefExecAndScriptFailure(['echo g:testlist[4]'], 'E684: List index out of range: 4', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testlist[-5]'], 'E684:', 1)
v9.CheckDefExecAndScriptFailure(['echo g:testdict["a" : "b"]'], 'E719:', 1)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 9287ed5..5f42c1c 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -3709,7 +3709,7 @@
var buf = g:RunVimInTerminal('-S XTest_opfunc_error', {rows: 6, wait_for_ruler: 0})
g:WaitForAssert(() => assert_match('Press ENTER', term_getline(buf, 6)))
- g:WaitForAssert(() => assert_match('E684: list index out of range: 0', term_getline(buf, 5)))
+ g:WaitForAssert(() => assert_match('E684: List index out of range: 0', term_getline(buf, 5)))
# clean up
g:StopVimInTerminal(buf)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index c5c3eb9..7166b13 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1527,7 +1527,7 @@
source Xtestscript.vim
catch /E684/
# function name should contain <SNR> every time
- assert_match('E684: list index out of range', v:exception)
+ assert_match('E684: List index out of range', v:exception)
assert_match('function <SNR>\d\+_Func, line 1', v:throwpoint)
endtry
endfor
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index 619006f..c9f58c2 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -3077,7 +3077,7 @@
endif
END
call writefile(code, 'Xtest')
- call AssertException(['source Xtest'], 'Vim(else):E583: multiple :else')
+ call AssertException(['source Xtest'], 'Vim(else):E583: Multiple :else')
" :elseif after :else
let code =<< trim END
diff --git a/src/version.c b/src/version.c
index 57dec85..3957325 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4892,
+/**/
4891,
/**/
4890,