Patch 9.0.0217

[Bram Moolenaar]

Patch 9.0.0217
Problem: 'shellslash' works differently when sourcing a script again.
Solution: Use the name from the script item. (closes #10920)
Files: src/scriptfile.c, src/testdir/test_expand_func.vim


*** ../vim-9.0.0216/src/scriptfile.c 2022-06-29 12:54:48.068572061 +0100
--- src/scriptfile.c 2022-08-15 17:51:29.489198179 +0100
***************
*** 1534,1543 ****
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);
--- 1534,1539 ----
***************
*** 1630,1635 ****
--- 1626,1635 ----
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)
{
*** ../vim-9.0.0216/src/testdir/test_expand_func.vim 2022-04-28 19:06:24.000000000 +0100
--- src/testdir/test_expand_func.vim 2022-08-15 17:51:29.489198179 +0100
***************
*** 41,47 ****
call assert_match('test_expand_func\.vim$', s:sfile)
let expected = 'script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack'
call assert_match(expected .. '$', expand('<sfile>'))
! call assert_match(expected .. '\[4\]' , expand('<stack>'))

" Call in script-local function
call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack\[7\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile())
--- 41,47 ----
call assert_match('test_expand_func\.vim$', s:sfile)
let expected = 'script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack'
call assert_match(expected .. '$', expand('<sfile>'))
! call assert_match(expected .. '\[4\]$' , expand('<stack>'))

" Call in script-local function
call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack\[7\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile())
***************
*** 59,65 ****
--- 59,90 ----
call writefile(lines, 'Xstack')
source Xstack
call assert_match('\<Xstack\[2\]$', g:stack_value)
+ unlet g:stack_value
call delete('Xstack')
+
+ if exists('+shellslash')
+ call mkdir('Xshellslash')
+ let lines =<< trim END
+ let g:stack1 = expand('<stack>')
+ set noshellslash
+ let g:stack2 = expand('<stack>')
+ set shellslash
+ let g:stack3 = expand('<stack>')
+ END
+ call writefile(lines, 'Xshellslash/Xstack')
+ " Test that changing 'shellslash' always affects the result of expand()
+ " when sourcing a script multiple times.
+ for i in range(2)
+ source Xshellslash/Xstack
+ call assert_match('\<Xshellslash/Xstack\[1\]$', g:stack1)
+ call assert_match('\<Xshellslash\\Xstack\[3\]$', g:stack2)
+ call assert_match('\<Xshellslash/Xstack\[5\]$', g:stack3)
+ unlet g:stack1
+ unlet g:stack2
+ unlet g:stack3
+ endfor
+ call delete('Xshellslash', 'rf')
+ endif
endfunc

func Test_expand_slnum()
*** ../vim-9.0.0216/src/version.c 2022-08-15 17:28:23.660240894 +0100
--- src/version.c 2022-08-15 17:52:39.209091278 +0100
***************
*** 737,738 ****
--- 737,740 ----
{ /* Add new patch number below this line */
+ /**/
+ 217,
/**/

--
GUARD #2: It could be carried by an African swallow!
GUARD #1: Oh, yeah, an African swallow maybe, but not a European swallow,
that's my point.
GUARD #2: Oh, yeah, I agree with that...
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///