# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1627480805 -7200
# Node ID 8ecd3575bc8cf8b633449c4ddf1772821409ff2f
# Parent  8312a5e2eef2bc2c8704c17d1359ddaaf8e8f5db
patch 8.2.3235: cannot use lambda in {} block in user command

Commit: https://github.com/vim/vim/commit/6868634abd6a49b2dfd3a994a6da7d5911457a37
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jul 28 15:54:54 2021 +0200

    patch 8.2.3235: cannot use lambda in {} block in user command

    Problem:    Cannot use lambda in {} block in user command. (Martin Tournoij)
    Solution:   Do not go over the end of the lambda.

diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim
--- a/src/testdir/test_usercommands.vim
+++ b/src/testdir/test_usercommands.vim
@@ -632,6 +632,13 @@ func Test_usercmd_with_block()
   call assert_equal('more', g:didmore)
   unlet g:didit
   unlet g:didmore
+  delcommand DoSomething
+
+  command DoMap {
+	echo [1, 2, 3]->map((_, v) => v + 1)
+    }
+  DoMap
+  delcommand DoMap
 
   let lines =<< trim END
       command DoesNotEnd {
diff --git a/src/userfunc.c b/src/userfunc.c
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1398,7 +1398,7 @@ get_lambda_tv(
 
 	// If there are line breaks, we need to split up the string.
 	line_end = vim_strchr(start, '\n');
-	if (line_end == NULL)
+	if (line_end == NULL || line_end > end)
 	    line_end = end;
 
 	// Add "return " before the expression (or the first line).
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3235,
+/**/
     3234,
 /**/
     3233,