diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 13 | ||||
| -rw-r--r-- | src/nvim/terminal.c | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 9e2707ffda..233a7d4aac 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -6584,16 +6584,15 @@ apply_autocmds_group ( fname = vim_strsave(fname); /* make a copy, so we can change it */ } else { sfname = vim_strsave(fname); - /* Don't try expanding FileType, Syntax, FuncUndefined, WindowID, - * ColorScheme, QuickFixCmd or JobActivity */ - if (event == EVENT_FILETYPE - || event == EVENT_SYNTAX + // don't try expanding the following events + if (event == EVENT_COLORSCHEME + || event == EVENT_FILETYPE || event == EVENT_FUNCUNDEFINED + || event == EVENT_QUICKFIXCMDPOST + || event == EVENT_QUICKFIXCMDPRE || event == EVENT_REMOTEREPLY || event == EVENT_SPELLFILEMISSING - || event == EVENT_QUICKFIXCMDPRE - || event == EVENT_COLORSCHEME - || event == EVENT_QUICKFIXCMDPOST + || event == EVENT_SYNTAX || event == EVENT_TABCLOSED) fname = vim_strsave(fname); else diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 7242abaa45..b4a6850e00 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -894,8 +894,7 @@ static void on_refresh(Event event) } Terminal *term; void *stub; (void)(stub); - // dont process autocommands while updating terminal buffers. JobActivity can - // be used act on terminal output. + // don't process autocommands while updating terminal buffers block_autocmds(); map_foreach(invalidated_terminals, term, stub, { // TODO(SplinterOfChaos): Find the condition that makes term->buf invalid. |