patch 8.2.2775: Vim9: wrong line number used for some commands
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.
diff --git a/src/vim9execute.c b/src/vim9execute.c
index b7db0e2..abcbce0 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -329,9 +329,9 @@
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 @@
// 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;