aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-13 22:54:27 -05:00
Code Activity

patch 8.2.4179: 'foldtext' is evaluated in the current script context

Browse Source 
Problem:    'foldtext' is evaluated in the current script context.
Solution:   Use the script context where the option was set.
This commit is contained in:
Bram Moolenaar
2022-01-22 13:39:08 +00:00
parent 0bfa84916d
commit 9530b580a7
7 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fold.c
View File

@@ -1923,7 +1923,6 @@ get_foldtext(
if (*wp->w_p_fdt != NUL)
{
char_u dashes[MAX_LEVEL + 2];
win_T *save_curwin;
int level;
char_u *p;
@@ -1941,23 +1940,27 @@ get_foldtext(
set_vim_var_string(VV_FOLDDASHES, dashes, -1);
set_vim_var_nr(VV_FOLDLEVEL, (long)level);
// skip evaluating foldtext on errors
// skip evaluating 'foldtext' on errors
if (!got_fdt_error)
{
save_curwin = curwin;
win_T *save_curwin = curwin;
sctx_T saved_sctx = current_sctx;
curwin = wp;
curbuf = wp->w_buffer;
current_sctx = wp->w_p_script_ctx[WV_FDT];
++emsg_silent; // handle exceptions, but don't display errors
++emsg_off; // handle exceptions, but don't display errors
text = eval_to_string_safe(wp->w_p_fdt,
was_set_insecurely((char_u *)"foldtext", OPT_LOCAL));
--emsg_silent;
was_set_insecurely((char_u *)"foldtext", OPT_LOCAL), TRUE);
--emsg_off;
if (text == NULL || did_emsg)
got_fdt_error = TRUE;
curwin = save_curwin;
curbuf = curwin->w_buffer;
current_sctx = saved_sctx;
}
last_lnum = lnum;
last_wp = wp;