# HG changeset patch # User Bram Moolenaar # Date 1545422406 -3600 # Node ID 49bc670c3ee9019088c60d80a671f96e5c7edfde # Parent 0fd814a309db0ea90ff8e1410d02e84ed436c07b patch 8.1.0618: term_getjob() does not return v:null as documented commit https://github.com/vim/vim/commit/528ccfbaa1cc805f430a750c551e5a9fd7eb54fe Author: Bram Moolenaar Date: Fri Dec 21 20:55:22 2018 +0100 patch 8.1.0618: term_getjob() does not return v:null as documented Problem: term_getjob() does not return v:null as documented. Solution: Do return v:null. (Damien) Add a test. diff --git a/src/terminal.c b/src/terminal.c --- a/src/terminal.c +++ b/src/terminal.c @@ -4794,11 +4794,14 @@ f_term_getjob(typval_T *argvars, typval_ { buf_T *buf = term_get_buf(argvars, "term_getjob()"); + if (buf == NULL) + { + rettv->v_type = VAR_SPECIAL; + rettv->vval.v_number = VVAL_NULL; + return; + } + rettv->v_type = VAR_JOB; - rettv->vval.v_job = NULL; - if (buf == NULL) - return; - rettv->vval.v_job = buf->b_term->tl_job; if (rettv->vval.v_job != NULL) ++rettv->vval.v_job->jv_refcount; diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1714,3 +1714,8 @@ func Test_stop_in_terminal() call Stop_shell_in_terminal(bufnr) exe bufnr . 'bwipe' endfunc + +func Test_terminal_no_job() + let term = term_start('false', {'term_finish': 'close'}) + call WaitForAssert({-> assert_equal(v:null, term_getjob(term)) }) +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 618, +/**/ 617, /**/ 616,