Patch 8.2.1185 (after 8.2.1183)
Problem:    Some other tests fail.
Solution:   Adjust tests for different assert_fails() behavior.
Files:      src/testdir/test_lua.vim, src/testdir/test_tcl.vim


*** ../vim-8.2.1184/src/testdir/test_lua.vim    2020-07-01 13:52:50.664017642 
+0200
--- src/testdir/test_lua.vim    2020-07-11 22:46:46.611778374 +0200
***************
*** 184,190 ****
    call assert_fails("call luaeval('vim.call(\"type\", co)')",
          \ '[string "luaeval"]:1: lua: cannot convert value')
    lua co = nil
!   call assert_fails("call luaeval('vim.call(\"abc\")')", '[string 
"luaeval"]:1: lua: call_vim_function failed')
  endfunc
  
  " Test vim.fn.*
--- 184,190 ----
    call assert_fails("call luaeval('vim.call(\"type\", co)')",
          \ '[string "luaeval"]:1: lua: cannot convert value')
    lua co = nil
!   call assert_fails("call luaeval('vim.call(\"abc\")')", ['E117:', '\[string 
"luaeval"]:1: lua: call_vim_function failed'])
  endfunc
  
  " Test vim.fn.*
***************
*** 637,643 ****
    call assert_fails('lua f1 = vim.funcref(fname)',
          \ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string 
expected, got nil)")
    call assert_fails('lua vim.funcref("abc")()',
!         \ '[string "vim chunk"]:1: cannot call funcref')
  
    " dict funcref
    function Mylen() dict
--- 637,643 ----
    call assert_fails('lua f1 = vim.funcref(fname)',
          \ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string 
expected, got nil)")
    call assert_fails('lua vim.funcref("abc")()',
!         \ ['E117:', '\[string "vim chunk"]:1: cannot call funcref'])
  
    " dict funcref
    function Mylen() dict
*** ../vim-8.2.1184/src/testdir/test_tcl.vim    2020-07-09 18:49:19.395577627 
+0200
--- src/testdir/test_tcl.vim    2020-07-11 22:49:19.795321526 +0200
***************
*** 27,33 ****
    " Try to run a command in a 'nomodifiable' buffer
    call setline(1, ['one', 'two', 'three'])
    set nomodifiable
!   call assert_fails('tcldo set line "abc"', 'cannot save undo information')
    set modifiable
  
    %bwipe!
--- 27,34 ----
    " Try to run a command in a 'nomodifiable' buffer
    call setline(1, ['one', 'two', 'three'])
    set nomodifiable
!   call assert_fails('tcldo set line "abc"',
!         \ ['E21:', 'cannot save undo information'])
    set modifiable
  
    %bwipe!
***************
*** 449,455 ****
    " Try to delete lines from an 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $::vim::current(buffer) delete 2 1',
!         \ 'cannot save undo information')
    set modifiable
  
    bwipe!
--- 450,456 ----
    " Try to delete lines from an 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $::vim::current(buffer) delete 2 1',
!         \ ['E21:', 'cannot save undo information'])
    set modifiable
  
    bwipe!
***************
*** 495,501 ****
    " Try to append lines to a 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $buf append 1 "first"',
!         \ 'cannot save undo information')
    set modifiable
  
    tcl unset buf
--- 496,502 ----
    " Try to append lines to a 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $buf append 1 "first"',
!         \ ['E21:', 'cannot save undo information'])
    set modifiable
  
    tcl unset buf
***************
*** 531,541 ****
    " Try to modify a 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $::vim::current(buffer) set 1 "x"',
!         \ 'cannot save undo information')
    call assert_fails('tcl $::vim::current(buffer) set 1 {a b}',
!         \ 'cannot save undo information')
    call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}',
!         \ 'cannot save undo information')
    set modifiable
    bwipe!
  endfunc
--- 532,542 ----
    " Try to modify a 'nomodifiable' buffer
    set nomodifiable
    call assert_fails('tcl $::vim::current(buffer) set 1 "x"',
!         \ ['E21:', 'cannot save undo information'])
    call assert_fails('tcl $::vim::current(buffer) set 1 {a b}',
!         \ ['E21:', 'cannot save undo information'])
    call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}',
!         \ ['E21:', 'cannot save undo information'])
    set modifiable
    bwipe!
  endfunc
*** ../vim-8.2.1184/src/version.c       2020-07-11 22:25:53.403842060 +0200
--- src/version.c       2020-07-11 22:43:56.052291121 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     1185,
  /**/

-- 
10e12 microphone == 1 megaphone

 /// Bram Moolenaar -- [email protected] -- 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    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/202007112050.06BKoURb2322584%40masaka.moolenaar.net.

Raspunde prin e-mail lui