Merge #9736 from janlazo/vim-8.1.0019

This commit is contained in:
Justin M. Keyes 2019-03-16 18:30:56 +01:00 committed by GitHub
commit 8d00393d0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions

View File

@ -6328,8 +6328,12 @@ call_func(
}
/* execute the function if no errors detected and executing */
if (evaluate && error == ERROR_NONE) {
// Execute the function if executing and no errors were detected.
if (!evaluate) {
// Not evaluating, which means the return value is unknown. This
// matters for giving error messages.
rettv->v_type = VAR_UNKNOWN;
} else if (error == ERROR_NONE) {
char_u *rfname = fname;
/* Ignore "g:" before a function name. */

View File

@ -291,3 +291,9 @@ func Test_named_function_closure()
call garbagecollect()
call assert_equal(14, s:Abar())
endfunc
func Test_lambda_with_index()
let List = {x -> [x]}
let Extract = {-> function(List, ['foobar'])()[0]}
call assert_equal('foobar', Extract())
endfunc

View File

@ -47,6 +47,9 @@ func Test_repeat_many()
call timer_stopall()
let g:val = 0
let timer = timer_start(50, 'MyHandler', {'repeat': -1})
if has('mac')
sleep 200m
endif
sleep 200m
call timer_stop(timer)
call assert_inrange((has('mac') ? 1 : 2), 4, g:val)