Skip to content

Commit 0e65962

Browse files
committed
Remove all references to JobActivity
The JobActivity event got replaced by callback functions provided to jobstart() or termopen(). It got removed here: 6e7757a
1 parent 8171fc4 commit 0e65962

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

runtime/doc/autocmd.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ ShellCmdPost After executing a shell command with |:!cmd|,
791791
|:make| and |:grep|. Can be used to check for
792792
any changed files.
793793
For non-blocking shell commands, see
794-
|JobActivity|.
794+
|job-control|.
795795
*ShellFilterPost*
796796
ShellFilterPost After executing a shell command with
797797
":{range}!cmd", ":w !cmd" or ":r !cmd".

runtime/doc/eval.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4059,9 +4059,9 @@ jobstop({job}) {Nvim} *jobstop()*
40594059
Stop a job created with |jobstart()| by sending a `SIGTERM`
40604060
to the corresponding process. If the process doesn't exit
40614061
cleanly soon, a `SIGKILL` will be sent. When the job is
4062-
finally closed, a |JobActivity| event will trigger with
4063-
`v:job_data[0]` set to `exited`. See |job-control| for more
4064-
information.
4062+
finally closed, the exit handler provided to |jobstart()| or
4063+
|termopen()| will be run.
4064+
See |job-control| for more information.
40654065

40664066
jobwait({ids}[, {timeout}]) {Nvim} *jobwait()*
40674067
Wait for a set of jobs to finish. The {ids} argument is a list

runtime/syntax/vim.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ syn keyword vimErrSetting contained hardtabs ht w1200 w300 w9600
6262

6363
" AutoCmd Events {{{2
6464
syn case ignore
65-
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
65+
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
6666

6767
" Highlight commonly used Groupnames {{{2
6868
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

src/nvim/fileio.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6584,16 +6584,15 @@ apply_autocmds_group (
65846584
fname = vim_strsave(fname); /* make a copy, so we can change it */
65856585
} else {
65866586
sfname = vim_strsave(fname);
6587-
/* Don't try expanding FileType, Syntax, FuncUndefined, WindowID,
6588-
* ColorScheme, QuickFixCmd or JobActivity */
6589-
if (event == EVENT_FILETYPE
6590-
|| event == EVENT_SYNTAX
6587+
// don't try expanding the following events
6588+
if (event == EVENT_COLORSCHEME
6589+
|| event == EVENT_FILETYPE
65916590
|| event == EVENT_FUNCUNDEFINED
6591+
|| event == EVENT_QUICKFIXCMDPOST
6592+
|| event == EVENT_QUICKFIXCMDPRE
65926593
|| event == EVENT_REMOTEREPLY
65936594
|| event == EVENT_SPELLFILEMISSING
6594-
|| event == EVENT_QUICKFIXCMDPRE
6595-
|| event == EVENT_COLORSCHEME
6596-
|| event == EVENT_QUICKFIXCMDPOST
6595+
|| event == EVENT_SYNTAX
65976596
|| event == EVENT_TABCLOSED)
65986597
fname = vim_strsave(fname);
65996598
else

src/nvim/terminal.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,8 +894,7 @@ static void on_refresh(Event event)
894894
}
895895
Terminal *term;
896896
void *stub; (void)(stub);
897-
// dont process autocommands while updating terminal buffers. JobActivity can
898-
// be used act on terminal output.
897+
// don't process autocommands while updating terminal buffers
899898
block_autocmds();
900899
map_foreach(invalidated_terminals, term, stub, {
901900
// TODO(SplinterOfChaos): Find the condition that makes term->buf invalid.

test/functional/job/job_spec.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ describe('jobs', function()
6161
file:write("abc\0def\n")
6262
file:close()
6363

64-
-- v:job_data preserves NULs.
6564
nvim('command', "let j = jobstart(['cat', '"..filename.."'], g:job_opts)")
6665
eq({'notification', 'stdout', {0, {'abc\ndef', ''}}}, next_msg())
6766
eq({'notification', 'exit', {0, 0}}, next_msg())

0 commit comments

Comments
 (0)