1
0
forked from aniani/vim

patch 8.2.0913: code for resetting v:register is duplicated

Problem:    Code for resetting v:register is duplicated.
Solution:   Add reset_reg_var().
This commit is contained in:
Bram Moolenaar
2020-06-06 15:58:03 +02:00
parent 11f1ffd182
commit 439c036ed0
5 changed files with 24 additions and 17 deletions

View File

@@ -244,7 +244,9 @@ evalvars_init(void)
set_vim_var_nr(VV_ECHOSPACE, sc_col - 1);
set_reg_var(0); // default for v:register is not 0 but '"'
// Default for v:register is not 0 but '"'. This is adjusted once the
// clipboard has been setup by calling reset_reg_var().
set_reg_var(0);
}
#if defined(EXITFREE) || defined(PROTO)
@@ -2191,6 +2193,22 @@ set_argv_var(char **argv, int argc)
set_vim_var_list(VV_ARGV, l);
}
/*
* Reset v:register, taking the 'clipboard' setting into account.
*/
void
reset_reg_var(void)
{
int regname = 0;
// Adjust the register according to 'clipboard', so that when
// "unnamed" is present it becomes '*' or '+' instead of '"'.
#ifdef FEAT_CLIPBOARD
adjust_clip_reg(&regname);
#endif
set_reg_var(regname);
}
/*
* Set v:register if needed.
*/