commit f29c1c6aa3f365c025890fab5fb9efbe88eb1761
author Bram Moolenaar <Bram@vim.org> Mon Sep 10 21:05:02 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Sep 10 21:05:02 2018 +0200
tree 3cd43ee75a7e0fbdce4902426512ae804b1c7ff0
parent 6b0b83f768cf536b34ce4d3f2de6bf62324229aa

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".

src/menu.c

diff --git a/src/menu.c b/src/menu.c
index 58429dc..d253e72 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2259,7 +2259,7 @@
     /* Use the Insert mode entry when returning to Insert mode. */
     if (restart_edit
 #ifdef FEAT_EVAL
-	    && !current_SID
+	    && !current_sctx.sc_sid
 #endif
 	    )
     {
@@ -2333,7 +2333,7 @@
 	 * Otherwise put them in the typeahead buffer. */
 	if (eap == NULL
 #ifdef FEAT_EVAL
-		|| current_SID != 0
+		|| current_sctx.sc_sid != 0
 #endif
 	   )
 	{