aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.3882: more duplicated code in f_getreginfo()

Browse Source 
Problem:    More duplicated code in f_getreginfo().
Solution:   Also use getreg_get_regname(). (closes #9398)
This commit is contained in:
zeertzjq
2021-12-24 12:02:43 +00:00
committed by Bram Moolenaar
parent 6073f13f55
commit d3f00f54bf
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/evalfunc.c
View File

@@ -4675,8 +4675,8 @@ f_getpos(typval_T *argvars, typval_T *rettv)
} }
/* /*
* Common between getreg() and getregtype(): get the register name from the * Common between getreg(), getreginfo() and getregtype(): get the register
* first argument. * name from the first argument.
* Returns zero on error. * Returns zero on error.
*/ */
static int static int
@@ -7821,7 +7821,6 @@ range_list_materialize(list_T *list)
static void static void
f_getreginfo(typval_T *argvars, typval_T *rettv) f_getreginfo(typval_T *argvars, typval_T *rettv)
{ {
char_u *strregname;
int regname; int regname;
char_u buf[NUMBUFLEN + 2]; char_u buf[NUMBUFLEN + 2];
long reglen = 0; long reglen = 0;
@@ -7831,22 +7830,11 @@ f_getreginfo(typval_T *argvars, typval_T *rettv)
if (in_vim9script() && check_for_opt_string_arg(argvars, 0) == FAIL) if (in_vim9script() && check_for_opt_string_arg(argvars, 0) == FAIL)
return; return;
if (argvars[0].v_type != VAR_UNKNOWN) regname = getreg_get_regname(argvars);
{ if (regname == 0)
strregname = tv_get_string_chk(&argvars[0]);
if (strregname == NULL)
return; return;
if (in_vim9script() && STRLEN(strregname) > 1)
{
semsg(_(e_register_name_must_be_one_char_str), strregname);
return;
}
}
else
strregname = get_vim_var_str(VV_REG);
regname = (strregname == NULL ? '"' : *strregname); if (regname == '@')
if (regname == 0 || regname == '@')
regname = '"'; regname = '"';
if (rettv_dict_alloc(rettv) == FAIL) if (rettv_dict_alloc(rettv) == FAIL)

2
src/version.c
View File

@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3882,
/**/ /**/
3881, 3881,
/**/ /**/