aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3634: error for already defined function uses wrong line number

Browse Source 
Problem:    Error for already defined function uses wrong line number.
Solution:   Set SOURCING_LNUM before giving the error message. (closes #9085)
This commit is contained in:
Bram Moolenaar 2021-11-20 21:46:20 +00:00
parent a755fdbe80
commit d604d78e7b
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/testdir/test_vim9_func.vim
View File

@ -741,7 +741,18 @@ def Test_nested_global_function()
enddef enddef
defcompile defcompile
END END
CheckScriptFailure(lines, "E1073:") CheckScriptFailure(lines, "E1073:", 1)
lines =<< trim END
vim9script
def Func()
echo 'script'
enddef
def Func()
echo 'script'
enddef
END
CheckScriptFailure(lines, "E1073:", 5)
enddef enddef
def DefListAll() def DefListAll()

1
src/userfunc.c
View File

@ -4256,6 +4256,7 @@ define_function(exarg_T *eap, char_u *name_arg)
&& (fp->uf_script_ctx.sc_sid != current_sctx.sc_sid && (fp->uf_script_ctx.sc_sid != current_sctx.sc_sid
|| fp->uf_script_ctx.sc_seq == current_sctx.sc_seq))) || fp->uf_script_ctx.sc_seq == current_sctx.sc_seq)))
{ {
SOURCING_LNUM = sourcing_lnum_top;
if (vim9script) if (vim9script)
emsg_funcname(e_name_already_defined_str, name); emsg_funcname(e_name_already_defined_str, name);
else else

2
src/version.c
View File

@ -757,6 +757,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 */
/**/
3634,
/**/ /**/
3633, 3633,
/**/ /**/