diff options
| -rw-r--r-- | runtime/doc/autocmd.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
| -rw-r--r-- | runtime/syntax/vim.vim | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 13 | ||||
| -rw-r--r-- | src/nvim/terminal.c | 3 | ||||
| -rw-r--r-- | test/functional/job/job_spec.lua | 1 |
6 files changed, 12 insertions, 15 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 1393131ab7..f771c225f4 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -791,7 +791,7 @@ ShellCmdPost After executing a shell command with |:!cmd|, |:make| and |:grep|. Can be used to check for any changed files. For non-blocking shell commands, see - |JobActivity|. + |job-control|. *ShellFilterPost* ShellFilterPost After executing a shell command with ":{range}!cmd", ":w !cmd" or ":r !cmd". diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 6215756f08..fc4bebbd6e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -4059,9 +4059,9 @@ jobstop({job}) {Nvim} *jobstop()* Stop a job created with |jobstart()| by sending a `SIGTERM` to the corresponding process. If the process doesn't exit cleanly soon, a `SIGKILL` will be sent. When the job is - finally closed, a |JobActivity| event will trigger with - `v:job_data[0]` set to `exited`. See |job-control| for more - information. + finally closed, the exit handler provided to |jobstart()| or + |termopen()| will be run. + See |job-control| for more information. jobwait({ids}[, {timeout}]) {Nvim} *jobwait()* Wait for a set of jobs to finish. The {ids} argument is a list diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 0842e53492..aadc3371f3 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -62,7 +62,7 @@ syn keyword vimErrSetting contained hardtabs ht w1200 w300 w9600 " AutoCmd Events {{{2 syn case ignore -syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CompleteDone CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave JobActivity MenuPopup QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabEnter TabLeave TabNew TabNewEntered TabClosed TermChanged TermResponse TextChanged TextChangedI User UserGettingBored VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave +syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CompleteDone CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabEnter TabLeave TabNew TabNewEntered TabClosed TermChanged TermResponse TextChanged TextChangedI User UserGettingBored VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave " Highlight commonly used Groupnames {{{2 syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 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. diff --git a/test/functional/job/job_spec.lua b/test/functional/job/job_spec.lua index 8191b63a1c..df989b3ef9 100644 --- a/test/functional/job/job_spec.lua +++ b/test/functional/job/job_spec.lua @@ -61,7 +61,6 @@ describe('jobs', function() file:write("abc\0def\n") file:close() - -- v:job_data preserves NULs. nvim('command', "let j = jobstart(['cat', '"..filename.."'], g:job_opts)") eq({'notification', 'stdout', {0, {'abc\ndef', ''}}}, next_msg()) eq({'notification', 'exit', {0, 0}}, next_msg()) |