# HG changeset patch # User Bram Moolenaar # Date 1658163607 -7200 # Node ID aeba55253de4e95d31293d4967861df4d2e95291 # Parent 95e7e9f24b5372c7e1417aa552691a2b2080411a patch 9.0.0056: wrong line number reported when :cexpr fails in :def function Commit: https://github.com/vim/vim/commit/bd683e3a79d73e608fec0df7cee1109a27f2e70a Author: Bram Moolenaar Date: Mon Jul 18 17:49:03 2022 +0100 patch 9.0.0056: wrong line number reported when :cexpr fails in :def function Problem: Wrong line number reported when :cexpr fails in :def function. Solution: Set line_number before executing :cexpr. (closes https://github.com/vim/vim/issues/10735) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -4205,6 +4205,18 @@ def Test_multiple_funcref() v9.CheckScriptSuccess(lines) enddef +def Test_cexpr_errmsg_line_number() + var lines =<< trim END + vim9script + def Func() + var qfl = {} + cexpr qfl + enddef + Func() + END + v9.CheckScriptFailure(lines, 'E777', 2) +enddef + " The following messes up syntax highlight, keep near the end. if has('python3') def Test_python3_command() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 56, +/**/ 55, /**/ 54, diff --git a/src/vim9execute.c b/src/vim9execute.c --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -2786,6 +2786,7 @@ exec_instructions(ectx_T *ectx) ea.cmdlinep = &iptr->isn_arg.cexpr.cexpr_ref->cer_cmdline; --ectx->ec_stack.ga_len; tv = STACK_TV_BOT(0); + SOURCING_LNUM = iptr->isn_lnum; res = cexpr_core(&ea, tv); clear_tv(tv); if (res == FAIL)