aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1516: Vim9: error for :exe has wrong line number

Browse Source 
Problem:    Vim9: error for :exe has wrong line number.
Solution:   Set line number before calling do_cmdline_cmd(). (closes #6774)
This commit is contained in:
Bram Moolenaar
2020-08-23 16:29:11 +02:00
parent 8436773fad
commit 430deb1945
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/testdir/test_vim9_script.vim
View File

@@ -2159,8 +2159,9 @@ def Test_execute_cmd()
echomsg [1, 2, 3] #{a: 1, b: 2} echomsg [1, 2, 3] #{a: 1, b: 2}
assert_match('^\[1, 2, 3\] {''a'': 1, ''b'': 2}$', Screenline(&lines)) assert_match('^\[1, 2, 3\] {''a'': 1, ''b'': 2}$', Screenline(&lines))
call CheckDefFailure(['execute xxx'], 'E1001:') call CheckDefFailure(['execute xxx'], 'E1001:', 1)
call CheckDefFailure(['execute "cmd"# comment'], 'E488:') call CheckDefExecFailure(['execute "tabnext " .. 8'], 'E475:', 1)
call CheckDefFailure(['execute "cmd"# comment'], 'E488:', 1)
enddef enddef
def Test_execute_cmd_vimscript() def Test_execute_cmd_vimscript()

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1516,
/**/ /**/
1515, 1515,
/**/ /**/

3
src/vim9execute.c
View File

@@ -1062,7 +1062,10 @@ call_def_function(
if (ga.ga_data != NULL) if (ga.ga_data != NULL)
{ {
if (iptr->isn_type == ISN_EXECUTE) if (iptr->isn_type == ISN_EXECUTE)
{
SOURCING_LNUM = iptr->isn_lnum;
do_cmdline_cmd((char_u *)ga.ga_data); do_cmdline_cmd((char_u *)ga.ga_data);
}
else else
{ {
msg_sb_eol(); msg_sb_eol();