diff options
| -rw-r--r-- | src/evalbuffer.c | 35 | ||||
| -rw-r--r-- | src/evalfunc.c | 36 | ||||
| -rw-r--r-- | src/map.c | 36 | ||||
| -rw-r--r-- | src/proto/map.pro | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 53 insertions, 59 deletions
diff --git a/src/evalbuffer.c b/src/evalbuffer.c index 3fb037c5f..77acf8fe9 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); } /* diff --git a/src/evalfunc.c b/src/evalfunc.c index 7fc1821c6..87b498a49 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -98,8 +98,6 @@ static void f_line2byte(typval_T *argvars, typval_T *rettv); #ifdef FEAT_LUA static void f_luaeval(typval_T *argvars, typval_T *rettv); #endif -static void f_maparg(typval_T *argvars, typval_T *rettv); -static void f_mapcheck(typval_T *argvars, typval_T *rettv); static void f_match(typval_T *argvars, typval_T *rettv); static void f_matchend(typval_T *argvars, typval_T *rettv); static void f_matchlist(typval_T *argvars, typval_T *rettv); @@ -6734,40 +6732,6 @@ f_luaeval(typval_T *argvars, typval_T *rettv) } #endif -/* - * "maparg()" function - */ - static void -f_maparg(typval_T *argvars, typval_T *rettv) -{ - if (in_vim9script() - && (check_for_string_arg(argvars, 0) == FAIL - || check_for_opt_string_arg(argvars, 1) == FAIL - || (argvars[1].v_type != VAR_UNKNOWN - && (check_for_opt_bool_arg(argvars, 2) == FAIL - || (argvars[2].v_type != VAR_UNKNOWN - && check_for_opt_bool_arg(argvars, 3) == FAIL))))) - return; - - get_maparg(argvars, rettv, TRUE); -} - -/* - * "mapcheck()" function - */ - static void -f_mapcheck(typval_T *argvars, typval_T *rettv) -{ - if (in_vim9script() - && (check_for_string_arg(argvars, 0) == FAIL - || check_for_opt_string_arg(argvars, 1) == FAIL - || (argvars[1].v_type != VAR_UNKNOWN - && check_for_opt_bool_arg(argvars, 2) == FAIL))) - return; - - get_maparg(argvars, rettv, FALSE); -} - typedef enum { MATCH_END, // matchend() @@ -2184,7 +2184,7 @@ check_map( return NULL; } - void + static void get_maparg(typval_T *argvars, typval_T *rettv, int exact) { char_u *keys; @@ -2288,6 +2288,40 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact) } /* + * "maparg()" function + */ + void +f_maparg(typval_T *argvars, typval_T *rettv) +{ + if (in_vim9script() + && (check_for_string_arg(argvars, 0) == FAIL + || check_for_opt_string_arg(argvars, 1) == FAIL + || (argvars[1].v_type != VAR_UNKNOWN + && (check_for_opt_bool_arg(argvars, 2) == FAIL + || (argvars[2].v_type != VAR_UNKNOWN + && check_for_opt_bool_arg(argvars, 3) == FAIL))))) + return; + + get_maparg(argvars, rettv, TRUE); +} + +/* + * "mapcheck()" function + */ + void +f_mapcheck(typval_T *argvars, typval_T *rettv) +{ + if (in_vim9script() + && (check_for_string_arg(argvars, 0) == FAIL + || check_for_opt_string_arg(argvars, 1) == FAIL + || (argvars[1].v_type != VAR_UNKNOWN + && check_for_opt_bool_arg(argvars, 2) == FAIL))) + return; + + get_maparg(argvars, rettv, FALSE); +} + +/* * "mapset()" function */ void diff --git a/src/proto/map.pro b/src/proto/map.pro index 6da455a7e..359262354 100644 --- a/src/proto/map.pro +++ b/src/proto/map.pro @@ -17,7 +17,8 @@ int makemap(FILE *fd, buf_T *buf); int put_escstr(FILE *fd, char_u *strstart, int what); void check_map_keycodes(void); char_u *check_map(char_u *keys, int mode, int exact, int ign_mod, int abbr, mapblock_T **mp_ptr, int *local_ptr); -void get_maparg(typval_T *argvars, typval_T *rettv, int exact); +void f_maparg(typval_T *argvars, typval_T *rettv); +void f_mapcheck(typval_T *argvars, typval_T *rettv); void f_mapset(typval_T *argvars, typval_T *rettv); void init_mappings(void); void add_map(char_u *map, int mode); diff --git a/src/version.c b/src/version.c index 046d1e744..ebd2c565d 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3252, +/**/ 3251, /**/ 3250, |