From 0e65962a6838ef36f8c518f067e753cbf40a87e5 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Fri, 10 Apr 2015 15:22:46 +0200 Subject: Remove all references to JobActivity The JobActivity event got replaced by callback functions provided to jobstart() or termopen(). It got removed here: https://github.com/neovim/neovim/commit/6e7757ad51dfe3b2de857ff8a8688718ff6115ac --- src/nvim/fileio.c | 13 ++++++------- src/nvim/terminal.c | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') 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. -- cgit