diff options
| author | TJ DeVries <devries.timothyj@gmail.com> | 2022-03-30 11:59:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 17:59:36 +0200 |
| commit | 7fb2310edb8f2fae1ddd175ef4bd6508ca3ce7e3 (patch) | |
| tree | c7057721653d9b13356d304a366316ac38dae85e /src | |
| parent | 1217694f21cff2953e6c56be2157365daf7078eb (diff) | |
| download | rneovim-7fb2310edb8f2fae1ddd175ef4bd6508ca3ce7e3.tar.gz rneovim-7fb2310edb8f2fae1ddd175ef4bd6508ca3ce7e3.tar.bz2 rneovim-7fb2310edb8f2fae1ddd175ef4bd6508ca3ce7e3.zip | |
fix: set nested before executing callback (#17801)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/autocmd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c index a36f2c97b5..d4af05b961 100644 --- a/src/nvim/autocmd.c +++ b/src/nvim/autocmd.c @@ -2022,6 +2022,11 @@ char_u *getnextac(int c, void *cookie, int indent, bool do_concat) verbose_leave_scroll(); } + // Make sure to set autocmd_nested before executing + // lua code, so that it works properly + autocmd_nested = ac->nested; + current_sctx = ac->script_ctx; + if (ac->exec.type == CALLABLE_CB) { typval_T argsin = TV_INITIAL_VALUE; typval_T rettv = TV_INITIAL_VALUE; @@ -2052,8 +2057,6 @@ char_u *getnextac(int c, void *cookie, int indent, bool do_concat) if (oneshot) { aucmd_del(ac); } - autocmd_nested = ac->nested; - current_sctx = ac->script_ctx; if (ac->last) { acp->nextcmd = NULL; } else { |