mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 18:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1489: Vim9: error when setting an option with setbufvar()

Browse Source 
Problem:    Vim9: error when setting an option with setbufvar().
Solution:   Do not get a number from a string value. (closes vim/vim#6740)
191929b182

Vim9 is N/A, so this just refactors the code without changing behavior.
This commit is contained in:
zeertzjq
2022-07-22 21:47:03 +08:00
parent 271739c830
commit 232cdbb880
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/nvim/eval/vars.c
View File

@@ -1544,6 +1544,18 @@ static void getwinvar(typval_T *argvars, typval_T *rettv, int off)
} }
} }
/// Set option "varname" to the value of "varp" for the current buffer/window.
static void set_option_from_tv(const char *varname, typval_T *varp)
{
bool error = false;
char nbuf[NUMBUFLEN];
const long numval = (long)tv_get_number_chk(varp, &error);
const char *const strval = tv_get_string_buf_chk(varp, nbuf);
if (!error && strval != NULL) {
set_option_value(varname, numval, strval, OPT_LOCAL);
}
}
/// "setwinvar()" and "settabwinvar()" functions /// "setwinvar()" and "settabwinvar()" functions
static void setwinvar(typval_T *argvars, typval_T *rettv, int off) static void setwinvar(typval_T *argvars, typval_T *rettv, int off)
{ {
@@ -1566,16 +1578,7 @@ static void setwinvar(typval_T *argvars, typval_T *rettv, int off)
switchwin_T switchwin; switchwin_T switchwin;
if (!need_switch_win || switch_win(&switchwin, win, tp, true) == OK) { if (!need_switch_win || switch_win(&switchwin, win, tp, true) == OK) {
if (*varname == '&') { if (*varname == '&') {
long numval; set_option_from_tv(varname + 1, varp);
bool error = false;
varname++;
numval = tv_get_number_chk(varp, &error);
char nbuf[NUMBUFLEN];
const char *const strval = tv_get_string_buf_chk(varp, nbuf);
if (!error && strval != NULL) {
set_option_value(varname, numval, strval, OPT_LOCAL);
}
} else { } else {
const size_t varname_len = strlen(varname); const size_t varname_len = strlen(varname);
char *const winvarname = xmalloc(varname_len + 3); char *const winvarname = xmalloc(varname_len + 3);
@@ -1789,20 +1792,12 @@ void f_setbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (buf != NULL && varname != NULL) { if (buf != NULL && varname != NULL) {
if (*varname == '&') { if (*varname == '&') {
long numval;
bool error = false;
aco_save_T aco; aco_save_T aco;
// set curbuf to be our buf, temporarily // set curbuf to be our buf, temporarily
aucmd_prepbuf(&aco, buf); aucmd_prepbuf(&aco, buf);
varname++; set_option_from_tv(varname + 1, varp);
numval = tv_get_number_chk(varp, &error);
char nbuf[NUMBUFLEN];
const char *const strval = tv_get_string_buf_chk(varp, nbuf);
if (!error && strval != NULL) {
set_option_value(varname, numval, strval, OPT_LOCAL);
}
// reset notion of buffer // reset notion of buffer
aucmd_restbuf(&aco); aucmd_restbuf(&aco);