diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2021-07-30 21:32:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-30 21:32:45 +0200 |
| commit | 4a15504e911bc90a29d862862f0b7a46d8acd12a (patch) | |
| tree | db22db4ff9f4a48327a9f6c442b9e241bcebb2f9 /src/evalbuffer.c | |
| parent | 0f5575d0a7316a9c9a4b02df3372a07514cd8f26 (diff) | |
patch 8.2.3252: duplicated code for adding buffer linesv8.2.3252
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)
Diffstat (limited to 'src/evalbuffer.c')
| -rw-r--r-- | src/evalbuffer.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/src/evalbuffer.c b/src/evalbuffer.c index 3fb037c5f1..77acf8fe90 100644 --- a/src/evalbuffer.c +++ b/src/evalbuffer.c @@ -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,11 +307,20 @@ 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 */ void @@ -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); } /* |