summaryrefslogtreecommitdiffstats
path: root/src/evalbuffer.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-26 15:56:19 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-26 15:56:19 +0100
commit8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8 (patch)
tree8e5f241129a1c690ea81d697a72fb4c1704c0cb6 /src/evalbuffer.c
parent1d9215b9aaa120b9d78fee49488556f73007ce78 (diff)
patch 8.2.0149: maintaining a Vim9 branch separately is more workv8.2.0149
Problem: Maintaining a Vim9 branch separately is more work. Solution: Merge the Vim9 script changes.
Diffstat (limited to 'src/evalbuffer.c')
-rw-r--r--src/evalbuffer.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index 09db525e28..d44fb10180 100644
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -176,6 +176,7 @@ set_buffer_lines(
if (lines->v_type == VAR_LIST)
{
l = lines->vval.v_list;
+ range_list_materialize(l);
li = l->lv_first;
}
else
@@ -689,10 +690,16 @@ get_buffer_lines(
{
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;