From a78eb25db3089b864dab8a9cc6c9e5270bf09644 Mon Sep 17 00:00:00 2001 From: Ernie Rael Date: Thu, 13 Jun 2024 17:24:54 +0200 Subject: patch 9.1.0481: Vim9: term_getjob() throws an exception on error Problem: Vim9: term_getjob() throws an exception on error Solution: Return null_job instead, when there is no job (Ernie Rael) closes: #14984 Signed-off-by: Ernie Rael Signed-off-by: Christian Brabandt --- src/terminal.c | 12 ++++++++++-- src/testdir/test_vim9_builtin.vim | 1 + src/version.c | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/terminal.c b/src/terminal.c index 07b69c6a7c..648fc78728 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -6171,8 +6171,16 @@ f_term_getjob(typval_T *argvars, typval_T *rettv) buf = term_get_buf(argvars, "term_getjob()"); if (buf == NULL) { - rettv->v_type = VAR_SPECIAL; - rettv->vval.v_number = VVAL_NULL; + if (in_vim9script()) + { + rettv->v_type = VAR_JOB; + rettv->vval.v_job = NULL; + } + else + { + rettv->v_type = VAR_SPECIAL; + rettv->vval.v_number = VVAL_NULL; + } return; } diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 3200b73358..6b1a50d416 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -4557,6 +4557,7 @@ enddef def Test_term_getjob() CheckRunVimInTerminal v9.CheckSourceDefAndScriptFailure(['term_getjob(0z10)'], ['E1013: Argument 1: type mismatch, expected string but got blob', 'E1220: String or Number required for argument 1']) + v9.CheckSourceDefAndScriptSuccess(['assert_true(term_getjob(0) == null_job)']) enddef def Test_term_getline() diff --git a/src/version.c b/src/version.c index 89ba9fc392..1360d1cfc3 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 481, /**/ 480, /**/ -- cgit v1.2.3