patch 8.1.0362: cannot get the script line number when executing a function
Problem: Cannot get the script line number when executing a function.
Solution: Store the line number besides the script ID. (Ozaki Kiichi,
closes #3362) Also display the line number with ":verbose set".
diff --git a/src/buffer.c b/src/buffer.c
index dcff94b..0bf6aa9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5412,7 +5412,7 @@
char_u *save_sourcing_name;
linenr_T save_sourcing_lnum;
#ifdef FEAT_EVAL
- scid_T save_SID;
+ sctx_T save_current_sctx;
#endif
prev = -1;
@@ -5497,12 +5497,13 @@
if (*s != NUL) /* skip over an empty "::" */
{
#ifdef FEAT_EVAL
- save_SID = current_SID;
- current_SID = SID_MODELINE;
+ save_current_sctx = current_sctx;
+ current_sctx.sc_sid = SID_MODELINE;
+ current_sctx.sc_lnum = 0;
#endif
retval = do_set(s, OPT_MODELINE | OPT_LOCAL | flags);
#ifdef FEAT_EVAL
- current_SID = save_SID;
+ current_sctx = save_current_sctx;
#endif
if (retval == FAIL) /* stop if error found */
break;