aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/path.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-04-17 16:10:21 +0800
committerGitHub <noreply@github.com>2023-04-17 16:10:21 +0800
commit53985a6d31cc60d4b2d7a7af91929922de9ecf4d (patch)
tree001e142766b44da21d94b1ffc99d5230d7e6bee1 /src/nvim/path.c
parent0dbb0419f47a76441d1e937d728033694c41cde7 (diff)
parent79a69337682ca0e3fc4d0bb9f70d851f8114bc9a (diff)
downloadrneovim-53985a6d31cc60d4b2d7a7af91929922de9ecf4d.tar.gz
rneovim-53985a6d31cc60d4b2d7a7af91929922de9ecf4d.tar.bz2
rneovim-53985a6d31cc60d4b2d7a7af91929922de9ecf4d.zip
Merge pull request #23148 from zeertzjq/vim-8.2.4179
vim-patch:8.2.{4179,4180,4181,4182,4183,4184,4185,4186,4193,4197}
Diffstat (limited to 'src/nvim/path.c')
-rw-r--r--src/nvim/path.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 137a8da2bc..cf7cd98829 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1661,10 +1661,15 @@ void simplify_filename(char *filename)
static char *eval_includeexpr(const char *const ptr, const size_t len)
{
+ const sctx_T save_sctx = current_sctx;
set_vim_var_string(VV_FNAME, ptr, (ptrdiff_t)len);
+ current_sctx = curbuf->b_p_script_ctx[BV_INEX].script_ctx;
+
char *res = eval_to_string_safe(curbuf->b_p_inex,
was_set_insecurely(curwin, "includeexpr", OPT_LOCAL));
+
set_vim_var_string(VV_FNAME, NULL, 0);
+ current_sctx = save_sctx;
return res;
}