refactor: pass window to was_set_insecurely

working on get_foldtext and wanted to get rid of the curwin backup/restore.
Turns out it's not possible else f_foldtext is run on the same window.
Kept the cleanup anyway.
This commit is contained in:
Matthieu Coudron
2020-11-18 22:52:49 +01:00
parent 7dfeadb0fc
commit 4f1fc0f6d5
9 changed files with 33 additions and 32 deletions

View File

@@ -1835,10 +1835,11 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume,
curwin = wp;
curbuf = wp->w_buffer;
++emsg_silent; /* handle exceptions, but don't display errors */
text = eval_to_string_safe(wp->w_p_fdt, NULL,
was_set_insecurely((char_u *)"foldtext", OPT_LOCAL));
--emsg_silent;
emsg_silent++; // handle exceptions, but don't display errors
text = eval_to_string_safe(
wp->w_p_fdt, NULL,
was_set_insecurely(wp, (char_u *)"foldtext", OPT_LOCAL));
emsg_silent--;
if (text == NULL || did_emsg)
got_fdt_error = TRUE;