aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0399: using :defer in expression funcref not tested

Browse Source 
Problem:    Using :defer in expression funcref not tested.
Solution:   Add a test.  Fix uncovered problems.
This commit is contained in:
Bram Moolenaar
2022-09-06 21:02:35 +01:00
parent ca16c60f33
commit 98aff658d5
5 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/userfunc.c
View File

@@ -2593,6 +2593,7 @@ call_user_func(
dict_T *selfdict) // Dictionary for "self"
{
sctx_T save_current_sctx;
ectx_T *save_current_ectx;
int using_sandbox = FALSE;
int save_sticky_cmdmod_flags = sticky_cmdmod_flags;
funccall_T *fc;
@@ -2669,9 +2670,9 @@ call_user_func(
islambda = fp->uf_flags & FC_LAMBDA;
/*
* Note about using fc->fc_fixvar[]: This is an array of FIXVAR_CNT variables
* with names up to VAR_SHORT_LEN long. This avoids having to alloc/free
* each argument variable and saves a lot of time.
* Note about using fc->fc_fixvar[]: This is an array of FIXVAR_CNT
* variables with names up to VAR_SHORT_LEN long. This avoids having to
* alloc/free each argument variable and saves a lot of time.
*/
/*
* Init l: variables.
@@ -2885,6 +2886,11 @@ call_user_func(
// "legacy" does not apply to commands in the function
sticky_cmdmod_flags = 0;
// If called from a compiled :def function the execution context must be
// hidden, any deferred functions need to be added to the function being
// executed here.
save_current_ectx = clear_currrent_ectx();
save_current_sctx = current_sctx;
current_sctx = fp->uf_script_ctx;
save_did_emsg = did_emsg;
@@ -2974,6 +2980,8 @@ call_user_func(
ESTACK_CHECK_NOW
estack_pop();
current_sctx = save_current_sctx;
restore_current_ectx(save_current_ectx);
#ifdef FEAT_PROFILE
if (do_profiling == PROF_YES)
script_prof_restore(&profile_info.pi_wait_start);