mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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 vim/vim#9398)
d3f00f54bf
This commit is contained in:
zeertzjq
2021-12-24 21:20:34 +08:00
parent 125e870772
commit 903ec5bd85
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/eval/funcs.c
View File

@@ -3918,8 +3918,8 @@ static void f_getqflist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
get_qf_loc_list(true, NULL, &argvars[0], rettv); get_qf_loc_list(true, NULL, &argvars[0], 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 getreg_get_regname(typval_T *argvars) static int getreg_get_regname(typval_T *argvars)
{ {
@@ -7331,18 +7331,12 @@ static void f_readfile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
/// "getreginfo()" function /// "getreginfo()" function
static void f_getreginfo(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_getreginfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
const char *strregname; int regname = getreg_get_regname(argvars);
if (argvars[0].v_type != VAR_UNKNOWN) { if (regname == 0) {
strregname = tv_get_string_chk(&argvars[0]); return;
if (strregname == NULL) {
return;
}
} else {
strregname = (const char *)get_vim_var_str(VV_REG);
} }
int regname = (strregname == NULL ? '"' : *strregname); if (regname == '@') {
if (regname == 0 || regname == '@') {
regname = '"'; regname = '"';
} }