aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.4181: Vim9: cannot use an import in 'diffexpr'

Browse Source 
Problem:    Vim9: cannot use an import in 'diffexpr'.
Solution:   Set the script context when evaluating 'diffexpr'.  Do not require
            'diffexpr' to return a bool, it was ignored anyway.
This commit is contained in:
Bram Moolenaar
2022-01-22 17:58:13 +00:00
parent 5600a709f4
commit 7b29f6a394
3 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/evalvars.c
View File

@@ -415,15 +415,26 @@ eval_diff(
char_u *newfile,
char_u *outfile)
{
int err = FALSE;
sctx_T saved_sctx = current_sctx;
sctx_T *ctx;
typval_T *tv;
set_vim_var_string(VV_FNAME_IN, origfile, -1);
set_vim_var_string(VV_FNAME_NEW, newfile, -1);
set_vim_var_string(VV_FNAME_OUT, outfile, -1);
(void)eval_to_bool(p_dex, &err, NULL, FALSE);
ctx = get_option_sctx("diffexpr");
if (ctx != NULL)
current_sctx = *ctx;
// errors are ignored
tv = eval_expr(p_dex, NULL);
clear_tv(tv);
set_vim_var_string(VV_FNAME_IN, NULL, -1);
set_vim_var_string(VV_FNAME_NEW, NULL, -1);
set_vim_var_string(VV_FNAME_OUT, NULL, -1);
current_sctx = saved_sctx;
}
void