diff options
| -rw-r--r-- | src/evalvars.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_assert.vim | 8 | ||||
| -rw-r--r-- | src/testdir/test_eval_stuff.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 70660397c..6e67206dc 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -3389,7 +3389,6 @@ static char_u *redir_varname = NULL; var_redir_start(char_u *name, int append) { int called_emsg_before; - int err; typval_T tv; // Catch a bad name early. diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim index c2d055c95..0ec710a14 100644 --- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -208,12 +208,12 @@ func Test_notmatch() endfunc func Test_assert_fail_fails() - call assert_equal(1, assert_fails('xxx', {})) - call assert_match("Expected {} but got 'E731:", v:errors[0]) + call assert_equal(1, assert_fails('xxx', 'E12345')) + call assert_match("Expected 'E12345' but got 'E492:", v:errors[0]) call remove(v:errors, 0) - call assert_equal(1, assert_fails('xxx', {}, 'stupid')) - call assert_match("stupid: Expected {} but got 'E731:", v:errors[0]) + call assert_equal(1, assert_fails('xxx', 'E9876', 'stupid')) + call assert_match("stupid: Expected 'E9876' but got 'E492:", v:errors[0]) call remove(v:errors, 0) call assert_equal(1, assert_fails('echo', '', 'echo command')) diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim index 3a229b5c1..6d95cc033 100644 --- a/src/testdir/test_eval_stuff.vim +++ b/src/testdir/test_eval_stuff.vim @@ -1,5 +1,7 @@ " Tests for various eval things. +source view_util.vim + function s:foo() abort try return [] == 0 @@ -17,13 +19,8 @@ func Test_nocatch_restore_silent_emsg() throw 1 catch endtry - echoerr 'wrong' - let c1 = nr2char(screenchar(&lines, 1)) - let c2 = nr2char(screenchar(&lines, 2)) - let c3 = nr2char(screenchar(&lines, 3)) - let c4 = nr2char(screenchar(&lines, 4)) - let c5 = nr2char(screenchar(&lines, 5)) - call assert_equal('wrong', c1 . c2 . c3 . c4 . c5) + echoerr 'wrong again' + call assert_equal('wrong again', ScreenLine(&lines)) endfunc func Test_mkdir_p() diff --git a/src/version.c b/src/version.c index ece1006d3..7c3ee485f 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1184, +/**/ 1183, /**/ 1182, |