thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3252: duplicated code for adding buffer lines

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

36
src/evalfunc.c
View File

@@ -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()