commit 8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8
author Bram Moolenaar <Bram@vim.org> Sun Jan 26 15:56:19 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 26 15:56:19 2020 +0100
tree 8e5f241129a1c690ea81d697a72fb4c1704c0cb6
parent 1d9215b9aaa120b9d78fee49488556f73007ce78

patch 8.2.0149: maintaining a Vim9 branch separately is more work

Problem:    Maintaining a Vim9 branch separately is more work.
Solution:   Merge the Vim9 script changes.

src/evalbuffer.c

diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index 09db525..d44fb10 100644
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -176,6 +176,7 @@
     if (lines->v_type == VAR_LIST)
     {
 	l = lines->vval.v_list;
+	range_list_materialize(l);
 	li = l->lv_first;
     }
     else
@@ -689,10 +690,16 @@
 {
     char_u	*p;
 
-    rettv->v_type = VAR_STRING;
-    rettv->vval.v_string = NULL;
-    if (retlist && rettv_list_alloc(rettv) == FAIL)
-	return;
+    if (retlist)
+    {
+	if (rettv_list_alloc(rettv) == FAIL)
+	    return;
+    }
+    else
+    {
+	rettv->v_type = VAR_STRING;
+	rettv->vval.v_string = NULL;
+    }
 
     if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
 	return;