From 2752360646545a9ae4853d2d5ca91cdb07c14eea Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Jun 2021 21:36:19 +0200
Subject: [PATCH] patch 8.2.2946: Vim9: substitute expression cannot be a List

Problem:    Vim9: substitute expression cannot be a List in a :def function.
Solution:   Use typval2string(). (closes #8330)
---
 src/testdir/test_vim9_cmd.vim | 7 +++++++
 src/version.c                 | 2 ++
 src/vim9execute.c             | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 6b31a6222..8481ecc59 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1236,6 +1236,13 @@ def Test_substitute_expr()
   END
   CheckScriptSuccess(lines)
   unlet g:cond
+
+  # List results in multiple lines
+  new
+  setline(1, 'some text here')
+  s/text/\=['aaa', 'bbb', 'ccc']/ 
+  assert_equal(['some aaa', 'bbb', 'ccc', ' here'], getline(1, '$'))
+  bwipe!
 enddef
 
 def Test_redir_to_var()
diff --git a/src/version.c b/src/version.c
index ec20c946e..efb1b4251 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2946,
 /**/
     2945,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index a13b0ab98..e870a279c 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -4130,7 +4130,7 @@ exe_substitute_instr(void)
     {
 	typval_T *tv = STACK_TV_BOT(-1);
 
-	res = vim_strsave(tv_get_string(tv));
+	res = typval2string(tv, TRUE);
 	--ectx->ec_stack.ga_len;
 	clear_tv(tv);
     }
-- 
2.40.0