Patch 8.2.1184

[Bram Moolenaar]

Patch 8.2.1184 (after 8.2.1183)
Problem: Some tests fail.
Solution: Adjust tests for different assert_fails() behavior. Remove unused
variable.
Files: src/testdir/test_assert.vim, src/testdir/test_eval_stuff.vim,
src/evalvars.c


*** ../vim-8.2.1183/src/testdir/test_assert.vim 2020-06-13 15:13:33.870532936 +0200
--- src/testdir/test_assert.vim 2020-07-11 20:00:17.415759400 +0200
***************
*** 208,219 ****
endfunc

func Test_assert_fail_fails()
! call assert_equal(1, assert_fails('xxx', {}))
! call assert_match("Expected {} but got 'E731:", 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 remove(v:errors, 0)

call assert_equal(1, assert_fails('echo', '', 'echo command'))
--- 208,219 ----
endfunc

func Test_assert_fail_fails()
! 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', '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'))
*** ../vim-8.2.1183/src/testdir/test_eval_stuff.vim 2020-06-07 18:16:31.311293288 +0200
--- src/testdir/test_eval_stuff.vim 2020-07-11 17:05:11.115983020 +0200
***************
*** 1,5 ****
--- 1,7 ----
" Tests for various eval things.

+ source view_util.vim
+
function s:foo() abort
try
return [] == 0
***************
*** 17,29 ****
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)
endfunc

func Test_mkdir_p()
--- 19,26 ----
throw 1
catch
endtry
! echoerr 'wrong again'
! call assert_equal('wrong again', ScreenLine(&lines))
endfunc

func Test_mkdir_p()
*** ../vim-8.2.1183/src/evalvars.c 2020-07-11 22:14:54.314422214 +0200
--- src/evalvars.c 2020-07-11 22:24:42.988113216 +0200
***************
*** 3389,3395 ****
var_redir_start(char_u *name, int append)
{
int called_emsg_before;
- int err;
typval_T tv;

// Catch a bad name early.
--- 3389,3394 ----
*** ../vim-8.2.1183/src/version.c 2020-07-11 22:14:54.322422193 +0200
--- src/version.c 2020-07-11 22:25:14.483990823 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1184,
/**/

--
hundred-and-one symptoms of being an internet addict:
8. You spend half of the plane trip with your laptop on your lap...and your
child in the overhead compartment.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///