summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-08-14 15:16:00 +0200
committerBram Moolenaar <Bram@vim.org>2021-08-14 15:16:00 +0200
commitd2e9ccee90d2b39f4c9fd6cec271ef3fafd76f09 (patch)
tree0e1b25283c6beba91932547c2d3357490107e9dd
parent4830c211a47f39edcf1827ffd787306faf65c2a5 (diff)
downloadvim-git-d2e9ccee90d2b39f4c9fd6cec271ef3fafd76f09.tar.gz
patch 8.2.3344: vimscript test failsv8.2.3344
Problem: Vimscript test fails. Solution: Have test verify first error instead of second
-rw-r--r--src/testdir/test_vimscript.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index de876589a..51ef2fc17 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -5657,7 +5657,12 @@ func Test_throw_multi_error()
call EXEC(cmd . ' novar #') " normal plus syntax error
catch /^Vim\((\a\+)\)\=:/
Xloop 'e'
- call assert_match('E488: Trailing characters', v:exception)
+ if cmd =~ 'unlet'
+ " TODO: should get error for 'novar'
+ call assert_match('E488: Trailing characters', v:exception)
+ else
+ call assert_match('E121: Undefined variable: novar', v:exception)
+ endif
finally
Xloop 'f'
call assert_equal("", v:errmsg)
diff --git a/src/version.c b/src/version.c
index b493c6341..97ddb8451 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 */
/**/
+ 3344,
+/**/
3343,
/**/
3342,