mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(autocmd): handle recursion for force set (#22820)

Browse Source
This commit is contained in:
Lewis Russell
2023-03-30 11:35:13 +01:00
committed by GitHub
parent 61e54f2636
commit e5fa2e3a5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/autocmd.c
View File

@@ -2761,9 +2761,9 @@ void do_autocmd_focusgained(bool gained)
void do_filetype_autocmd(buf_T *buf, bool force) void do_filetype_autocmd(buf_T *buf, bool force)
{ {
static bool recursive = false; static int ft_recursive = 0;
if (recursive && !force) { if (ft_recursive > 0 && !force) {
return; // disallow recursion return; // disallow recursion
} }
@@ -2774,12 +2774,12 @@ void do_filetype_autocmd(buf_T *buf, bool force)
// been checked to be safe. // been checked to be safe.
secure = 0; secure = 0;
recursive = true; ft_recursive++;
did_filetype = true; did_filetype = true;
// Only pass true for "force" when it is true or // Only pass true for "force" when it is true or
// used recursively, to avoid endless recurrence. // used recursively, to avoid endless recurrence.
apply_autocmds(EVENT_FILETYPE, buf->b_p_ft, buf->b_fname, force, buf); apply_autocmds(EVENT_FILETYPE, buf->b_p_ft, buf->b_fname, force, buf);
recursive = false; ft_recursive--;
// Just in case the old "buf" is now invalid // Just in case the old "buf" is now invalid
if (varp != &(buf->b_p_ft)) { if (varp != &(buf->b_p_ft)) {