patch 8.2.0150: cannot define python function when using :execute

Problem:    Cannot define python function when using :execute. (Yasuhiro
            Matsumoto)
Solution:   Do not recognize "def" inside "function.

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index ce1ab34d6df0565da16d7ace7beee9de20a9c0f2..d6a78544b744ff665fd26315bbceb4c49a406970 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1,5 +1,7 @@
 " Test various aspects of the Vim9 script language.
 
+source check.vim
+
 " Check that "lines" inside ":def" results in an "error" message.
 func CheckDefFailure(lines, error)
   call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef')
@@ -355,5 +357,16 @@ def Test_fixed_size_list()
   call assert_equal([2, 99, 3, 4, 5], l)
 enddef
 
+" Test that inside :function a Python function can be defined, :def is not
+" recognized.
+func Test_function_python()
+  CheckFeature python3
+  let py = 'python3'
+  execute py "<< EOF"
+def do_something():
+  return 1
+EOF
+endfunc
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/userfunc.c b/src/userfunc.c
index 808ed968a43744a9ffc4fe48529d554fe2572078..ce776eeab32d445a390943843d0c572b96cf8c12 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2667,8 +2667,11 @@ ex_function(exarg_T *eap)
                indent += 2;
 
            // Check for defining a function inside this function.
+           // Only recognize "def" inside "def", not inside "function",
+           // For backwards compatibility, see Test_function_python().
            c = *p;
-           if (checkforcmd(&p, "function", 2) || checkforcmd(&p, "def", 3))
+           if (checkforcmd(&p, "function", 2)
+                   || (eap->cmdidx == CMD_def && checkforcmd(&p, "def", 3)))
            {
                if (*p == '!')
                    p = skipwhite(p + 1);

diff --git a/src/version.c b/src/version.c
index 3b4a9599e14706768565a2801f574e70773f6d69..159d550363a7599d44cb5df1fb6ed41cd30dce85 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    150,
 /**/
     149,
 /**/