Mercurial > vim

comparison src/evalbuffer.c @ 19181:94eda51ba9ba v8.2.0149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0149: maintaining a Vim9 branch separately is more work Commit: https://github.com/vim/vim/commit/8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 26 15:56:19 2020 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jan 2020 16:00:05 +0100
parents cf051bdefb3f
children 06f29b6ea04a
comparison
equal deleted inserted replaced
19180:8edf0aeb71b9 19181:94eda51ba9ba
174 append_lnum = curbuf->b_ml.ml_line_count; 174 append_lnum = curbuf->b_ml.ml_line_count;
175 175
176 if (lines->v_type == VAR_LIST) 176 if (lines->v_type == VAR_LIST)
177 { 177 {
178 l = lines->vval.v_list; 178 l = lines->vval.v_list;
179 range_list_materialize(l);
179 li = l->lv_first; 180 li = l->lv_first;
180 } 181 }
181 else 182 else
182 line = tv_get_string_chk(lines); 183 line = tv_get_string_chk(lines);
183 184
687 int retlist, 688 int retlist,
688 typval_T *rettv) 689 typval_T *rettv)
689 { 690 {
690 char_u *p; 691 char_u *p;
691 692
692 rettv->v_type = VAR_STRING; 693 if (retlist)
693 rettv->vval.v_string = NULL; 694 {
694 if (retlist && rettv_list_alloc(rettv) == FAIL) 695 if (rettv_list_alloc(rettv) == FAIL)
695 return; 696 return;
697 }
698 else
699 {
700 rettv->v_type = VAR_STRING;
701 rettv->vval.v_string = NULL;
702 }
696 703
697 if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0) 704 if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
698 return; 705 return;
699 706
700 if (!retlist) 707 if (!retlist)