aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.3919: Vim9: wrong argument for append() results in two errors

Browse Source 
Problem:    Vim9: wrong argument for append() results in two errors.
Solution:   Check did_emsg.  Also for setline().  Adjust the help for
            appendbufline().
This commit is contained in:
Bram Moolenaar
2021-12-28 11:24:49 +00:00
parent be4e223ead
commit 8b6256f6ec
5 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/evalbuffer.c
View File

@@ -274,12 +274,14 @@ done:
f_append(typval_T *argvars, typval_T *rettv)
{
linenr_T lnum;
int did_emsg_before = did_emsg;
if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
return;
lnum = tv_get_lnum(&argvars[0]);
set_buffer_lines(curbuf, lnum, TRUE, &argvars[1], rettv);
if (did_emsg == did_emsg_before)
set_buffer_lines(curbuf, lnum, TRUE, &argvars[1], rettv);
}
/*
@@ -290,6 +292,7 @@ buf_set_append_line(typval_T *argvars, typval_T *rettv, int append)
{
linenr_T lnum;
buf_T *buf;
int did_emsg_before = did_emsg;
if (in_vim9script()
&& (check_for_buffer_arg(argvars, 0) == FAIL
@@ -303,7 +306,8 @@ buf_set_append_line(typval_T *argvars, typval_T *rettv, int append)
else
{
lnum = tv_get_lnum_buf(&argvars[1], buf);
set_buffer_lines(buf, lnum, append, &argvars[2], rettv);
if (did_emsg == did_emsg_before)
set_buffer_lines(buf, lnum, append, &argvars[2], rettv);
}
}
@@ -502,6 +506,9 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
win_T *curwin_save = NULL;
tabpage_T *tp;
win_T *wp;
int did_emsg_before = did_emsg;
rettv->vval.v_number = 1; // FAIL by default
if (in_vim9script()
&& (check_for_buffer_arg(argvars, 0) == FAIL
@@ -511,13 +518,12 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL)
{
rettv->vval.v_number = 1; // FAIL
return;
}
is_curbuf = buf == curbuf;
first = tv_get_lnum_buf(&argvars[1], buf);
if (did_emsg > did_emsg_before)
return;
if (argvars[2].v_type != VAR_UNKNOWN)
last = tv_get_lnum_buf(&argvars[2], buf);
else
@@ -525,10 +531,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
if (buf->b_ml.ml_mfp == NULL || first < 1
|| first > buf->b_ml.ml_line_count || last < first)
{
rettv->vval.v_number = 1; // FAIL
return;
}
if (!is_curbuf)
{
@@ -577,6 +580,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
curbuf = curbuf_save;
curwin = curwin_save;
}
rettv->vval.v_number = 0; // OK
}
/*
@@ -780,6 +784,7 @@ f_getbufline(typval_T *argvars, typval_T *rettv)
linenr_T lnum = 1;
linenr_T end = 1;
buf_T *buf;
int did_emsg_before = did_emsg;
if (in_vim9script()
&& (check_for_buffer_arg(argvars, 0) == FAIL
@@ -791,6 +796,8 @@ f_getbufline(typval_T *argvars, typval_T *rettv)
if (buf != NULL)
{
lnum = tv_get_lnum_buf(&argvars[1], buf);
if (did_emsg > did_emsg_before)
return;
if (argvars[2].v_type == VAR_UNKNOWN)
end = lnum;
else
@@ -852,12 +859,14 @@ f_setbufline(typval_T *argvars, typval_T *rettv)
f_setline(typval_T *argvars, typval_T *rettv)
{
linenr_T lnum;
int did_emsg_before = did_emsg;
if (in_vim9script() && check_for_lnum_arg(argvars, 0) == FAIL)
return;
lnum = tv_get_lnum(&argvars[0]);
set_buffer_lines(curbuf, lnum, FALSE, &argvars[1], rettv);
if (did_emsg == did_emsg_before)
set_buffer_lines(curbuf, lnum, FALSE, &argvars[1], rettv);
}
#endif // FEAT_EVAL