thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2775: Vim9: wrong line number used for some commands

Browse Source 
Problem:    Vim9: wrong line number used for some commands.
Solution:   For :exe, :echo and the like use the line number of the start of
            the command.  When calling a function set the line number in the
            script context.
This commit is contained in:
Bram Moolenaar
2021-04-17 17:59:19 +02:00
parent 6c7cc347af
commit c70fe460b0
5 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vim9execute.c
View File

@@ -329,9 +329,9 @@ call_dfunc(
if (entry != NULL)
{
// Set the script context to the script where the function was defined.
// TODO: save more than the SID?
entry->es_save_sid = current_sctx.sc_sid;
current_sctx.sc_sid = ufunc->uf_script_ctx.sc_sid;
// Save the current context so it can be restored on return.
entry->es_save_sctx = current_sctx;
current_sctx = ufunc->uf_script_ctx;
}
// Start execution at the first instruction.
@@ -562,7 +562,7 @@ func_return(funclocal_T *funclocal, ectx_T *ectx)
// execution context goes one level up
entry = estack_pop();
if (entry != NULL)
current_sctx.sc_sid = entry->es_save_sid;
current_sctx = entry->es_save_sctx;
if (handle_closure_in_use(ectx, TRUE) == FAIL)
return FAIL;