thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0359: MS-Windows: relative import in a script sourced from a buffer doesn't work

Browse Source 
Problem:  MS-Windows: Relative import in a script sourced from a buffer
          doesn't work (Ernie Rael)
Solution: Set a filename, so that we are not trying to use
          script-relative filename (Yegappan Lakshmanan)

When a script is sourced from a buffer, the file name is set to ":source
buffer=". In MS-Windows, the ":" is a path separator character (used
after a drive letter). This results in the code trying to use the ":"
prefix to import the script on MS-Windows. To fix this, when importing a
script from a script sourced from a buffer with nofile, don't use
a script relative path name.

fixes #14588
closes: #14603

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2024-04-20 18:31:21 +02:00
committed by Christian Brabandt
parent 8927c9b720
commit f135fa28e4
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/scriptfile.c
View File

@@ -1430,8 +1430,13 @@ do_source_buffer_init(source_cookie_T *sp, exarg_T *eap)
return NULL;
// Use ":source buffer=<num>" as the script name
vim_snprintf((char *)IObuff, IOSIZE, ":source buffer=%d", curbuf->b_fnum);
fname = vim_strsave(IObuff);
if (curbuf->b_ffname != NULL)
fname = vim_strsave(curbuf->b_ffname);
else
{
vim_snprintf((char *)IObuff, IOSIZE, ":source buffer=%d", curbuf->b_fnum);
fname = vim_strsave(IObuff);
}
if (fname == NULL)
return NULL;