patch 9.0.0217: 'shellslash' works differently when sourcing a script again
Problem: 'shellslash' works differently when sourcing a script again.
Solution: Use the name from the script item. (closes #10920)
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 952f2ef..053dd06 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1534,10 +1534,6 @@
cookie.level = ex_nesting_level;
#endif
- // Keep the sourcing name/lnum, for recursive calls.
- estack_push(ETYPE_SCRIPT, fname_exp, 0);
- ESTACK_CHECK_SETUP
-
#ifdef STARTUPTIME
if (time_fd != NULL)
time_push(&tv_rel, &tv_start);
@@ -1630,6 +1626,10 @@
si->sn_is_vimrc = is_vimrc;
}
+ // Keep the sourcing name/lnum, for recursive calls.
+ estack_push(ETYPE_SCRIPT, si->sn_name, 0);
+ ESTACK_CHECK_SETUP
+
# ifdef FEAT_PROFILE
if (do_profiling == PROF_YES)
{