Skip to content

Commit

Permalink
patch 8.2.3146: Vim9: line number wrong for :execute argument
Browse files Browse the repository at this point in the history
Problem:    Vim9: line number wrong for :execute argument.
Solution:   Use the line number of the :execute command itself. (closes #8537)
  • Loading branch information
brammool committed Jul 11, 2021
1 parent 4ece152 commit c03fe66
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/eval.c
Expand Up @@ -6191,6 +6191,7 @@ ex_execute(exarg_T *eap)
char_u *p;
garray_T ga;
int len;
long start_lnum = SOURCING_LNUM;

ga_init2(&ga, 1, 80);

Expand Down Expand Up @@ -6244,6 +6245,9 @@ ex_execute(exarg_T *eap)

if (ret != FAIL && ga.ga_data != NULL)
{
// use the first line of continuation lines for messages
SOURCING_LNUM = start_lnum;

if (eap->cmdidx == CMD_echomsg || eap->cmdidx == CMD_echoerr)
{
// Mark the already saved text as finishing the line, so that what
Expand Down
10 changes: 10 additions & 0 deletions src/testdir/test_vim9_script.vim
Expand Up @@ -4167,6 +4167,16 @@ def Test_option_modifier()
set hlsearch&
enddef

" This must be called last, it may cause following :def functions to fail
def Test_xxx_echoerr_line_number()
var lines =<< trim END
echoerr 'some'
.. ' error'
.. ' continued'
END
CheckDefExecAndScriptFailure(lines, 'some error continued', 1)
enddef

def ProfiledFunc()
var n = 3
echo [[1, 2], [3, 4]]->filter((_, l) => l[0] == n)
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -755,6 +755,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3146,
/**/
3145,
/**/
Expand Down

0 comments on commit c03fe66

Please sign in to comment.