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 8.2.4365: sticky command modifiers are too sticky

Browse Source 
Problem:    sticky command modifiers are too sticky.
Solution:   Do not apply command modifiers to a called function. (closes #9751)
This commit is contained in:
Bram Moolenaar
2022-02-12 22:13:06 +00:00
parent 4549166078
commit cdf0485969
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/userfunc.c
View File

@@ -2513,6 +2513,7 @@ call_user_func(
{
sctx_T save_current_sctx;
int using_sandbox = FALSE;
int save_sticky_cmdmod_flags = sticky_cmdmod_flags;
funccall_T *fc;
int save_did_emsg;
int default_arg_err = FALSE;
@@ -2569,6 +2570,7 @@ call_user_func(
if (do_profiling == PROF_YES)
profile_may_start_func(&profile_info, fp, caller);
#endif
sticky_cmdmod_flags = 0;
call_def_function(fp, argcount, argvars, funcexe->fe_partial, rettv);
funcdepth_decrement();
#ifdef FEAT_PROFILE
@@ -2578,6 +2580,7 @@ call_user_func(
#endif
current_funccal = fc->caller;
free_funccal(fc);
sticky_cmdmod_flags = save_sticky_cmdmod_flags;
return;
}
@@ -2797,6 +2800,9 @@ call_user_func(
fc->caller == NULL ? NULL : fc->caller->func);
#endif
// "legacy" does not apply to commands in the function
sticky_cmdmod_flags = 0;
save_current_sctx = current_sctx;
current_sctx = fp->uf_script_ctx;
save_did_emsg = did_emsg;
@@ -2889,6 +2895,7 @@ call_user_func(
#endif
if (using_sandbox)
--sandbox;
sticky_cmdmod_flags = save_sticky_cmdmod_flags;
if (p_verbose >= 12 && SOURCING_NAME != NULL)
{