0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.3252: duplicated code for adding buffer lines

Problem:    Duplicated code for adding buffer lines.
Solution:   Move code to a common function.  Also move map functions to map.c.
            (Yegappan Lakshmanan, closes #8665)
This commit is contained in:
Yegappan Lakshmanan
2021-07-30 21:32:45 +02:00
committed by Bram Moolenaar
parent 0f5575d0a7
commit 4a15504e91
5 changed files with 53 additions and 59 deletions

View File

@@ -287,10 +287,10 @@ f_append(typval_T *argvars, typval_T *rettv)
}
/*
* "appendbufline(buf, lnum, string/list)" function
* Set or append lines to a buffer.
*/
void
f_appendbufline(typval_T *argvars, typval_T *rettv)
static void
buf_set_append_line(typval_T *argvars, typval_T *rettv, int append)
{
linenr_T lnum;
buf_T *buf;
@@ -307,10 +307,19 @@ f_appendbufline(typval_T *argvars, typval_T *rettv)
else
{
lnum = tv_get_lnum_buf(&argvars[1], buf);
set_buffer_lines(buf, lnum, TRUE, &argvars[2], rettv);
set_buffer_lines(buf, lnum, append, &argvars[2], rettv);
}
}
/*
* "appendbufline(buf, lnum, string/list)" function
*/
void
f_appendbufline(typval_T *argvars, typval_T *rettv)
{
buf_set_append_line(argvars, rettv, TRUE);
}
/*
* "bufadd(expr)" function
*/
@@ -837,23 +846,7 @@ f_getline(typval_T *argvars, typval_T *rettv)
void
f_setbufline(typval_T *argvars, typval_T *rettv)
{
linenr_T lnum;
buf_T *buf;
if (in_vim9script()
&& (check_for_buffer_arg(argvars, 0) == FAIL
|| check_for_lnum_arg(argvars, 1) == FAIL
|| check_for_string_or_number_or_list_arg(argvars, 2) == FAIL))
return;
buf = tv_get_buf(&argvars[0], FALSE);
if (buf == NULL)
rettv->vval.v_number = 1; // FAIL
else
{
lnum = tv_get_lnum_buf(&argvars[1], buf);
set_buffer_lines(buf, lnum, FALSE, &argvars[2], rettv);
}
buf_set_append_line(argvars, rettv, FALSE);
}
/*