summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-20 15:03:15 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-20 15:03:15 +0200
commit2fb1b89d721682585228f9a6ee7da4b6d3c6634d (patch)
tree65f2197ba3d9047fb975bd71018a1c8af7cf66d4
parentca81f0e834640cf3465b3b742e60c12e8a0956f2 (diff)
patch 8.2.3024: execute() function test failsv8.2.3024
Problem: execute() function test fails. Solution: Adjust test for different error.
-rw-r--r--src/testdir/test_execute_func.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
index c08b2390f2..aa73e0f317 100644
--- a/src/testdir/test_execute_func.vim
+++ b/src/testdir/test_execute_func.vim
@@ -40,7 +40,7 @@ func Test_execute_string()
if has('float')
call assert_fails('call execute(3.4)', 'E492:')
call assert_equal("\nx", execute("echo \"x\"", 3.4))
- call CheckDefExecAndScriptFailure(['execute("echo \"x\"", 3.4)'], 'E806:')
+ call CheckDefExecAndScriptFailure2(['execute("echo \"x\"", 3.4)'], 'E1013: Argument 2: type mismatch, expected string but got float', 'E806:')
endif
endfunc
diff --git a/src/version.c b/src/version.c
index d341ecd410..ff8e46675b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3024,
+/**/
3023,
/**/
3022,