commit d604d78e7b2e63d118814d0fa0b4b702ec52aeed
author Bram Moolenaar <Bram@vim.org> Sat Nov 20 21:46:20 2021 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Nov 20 21:46:20 2021 +0000
tree 6985954065d036b8259dbaa95d614b0befa09215
parent a755fdbe80bed4897e06028f0044c208e0f9d8cb

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

Problem:    Error for already defined function uses wrong line number.
Solution:   Set SOURCING_LNUM before giving the error message. (closes #9085)

src/testdir/test_vim9_func.vim

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index c8b821e..34f84f2 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -741,7 +741,18 @@
       enddef
       defcompile
   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
 
 def DefListAll()

src/userfunc.c

diff --git a/src/userfunc.c b/src/userfunc.c
index 95d9c4a..602d3b7 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4256,6 +4256,7 @@
 			&& (fp->uf_script_ctx.sc_sid != current_sctx.sc_sid
 			  || fp->uf_script_ctx.sc_seq == current_sctx.sc_seq)))
 	    {
+		SOURCING_LNUM = sourcing_lnum_top;
 		if (vim9script)
 		    emsg_funcname(e_name_already_defined_str, name);
 		else

src/version.c

diff --git a/src/version.c b/src/version.c
index b53524f..fbbc961 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3634,
+/**/
     3633,
 /**/
     3632,