Mercurial > vim
changeset 21879:172b1746489c v8.2.1489
patch 8.2.1489: Vim9: error when setting an option with setbufvar()
Commit: https://github.com/vim/vim/commit/191929b182ba38abe6bc431fb9d8d9507f408903
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 19 21:20:49 2020 +0200
patch 8.2.1489: Vim9: error when setting an option with setbufvar()
Problem: Vim9: error when setting an option with setbufvar().
Solution: Do not get a number from a string value. (closes https://github.com/vim/vim/issues/6740)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 19 Aug 2020 21:30:04 +0200 |
| parents | 53a227dbb5c5 |
| children | 0520437529d0 |
| files | src/evalvars.c src/testdir/test_vim9_func.vim src/version.c |
| diffstat | 3 files changed, 34 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3293,6 +3293,24 @@ getwinvar( } /* + * Set option "varname" to the value of "varp" for the current buffer/window. + */ + static void +set_option_from_tv(char_u *varname, typval_T *varp) +{ + long numval = 0; + char_u *strval; + char_u nbuf[NUMBUFLEN]; + int error = FALSE; + + if (!in_vim9script() || varp->v_type != VAR_STRING) + numval = (long)tv_get_number_chk(varp, &error); + strval = tv_get_string_buf_chk(varp, nbuf); + if (!error && strval != NULL) + set_option_value(varname, numval, strval, OPT_LOCAL); +} + +/* * "setwinvar()" and "settabwinvar()" functions */ static void @@ -3304,7 +3322,6 @@ setwinvar(typval_T *argvars, int off) int need_switch_win; char_u *varname, *winvarname; typval_T *varp; - char_u nbuf[NUMBUFLEN]; tabpage_T *tp = NULL; if (check_secure()) @@ -3325,17 +3342,7 @@ setwinvar(typval_T *argvars, int off) || switch_win(&save_curwin, &save_curtab, win, tp, TRUE) == OK) { if (*varname == '&') - { - long numval; - char_u *strval; - int error = FALSE; - - ++varname; - numval = (long)tv_get_number_chk(varp, &error); - strval = tv_get_string_buf_chk(varp, nbuf); - if (!error && strval != NULL) - set_option_value(varname, numval, strval, OPT_LOCAL); - } + set_option_from_tv(varname + 1, varp); else { winvarname = alloc(STRLEN(varname) + 3); @@ -3759,7 +3766,6 @@ f_setbufvar(typval_T *argvars, typval_T buf_T *buf; char_u *varname, *bufvarname; typval_T *varp; - char_u nbuf[NUMBUFLEN]; if (check_secure()) return; @@ -3772,19 +3778,12 @@ f_setbufvar(typval_T *argvars, typval_T { if (*varname == '&') { - long numval; - char_u *strval; - int error = FALSE; aco_save_T aco; // set curbuf to be our buf, temporarily aucmd_prepbuf(&aco, buf); - ++varname; - numval = (long)tv_get_number_chk(varp, &error); - strval = tv_get_string_buf_chk(varp, nbuf); - if (!error && strval != NULL) - set_option_value(varname, numval, strval, OPT_LOCAL); + set_option_from_tv(varname + 1, varp); // reset notion of buffer aucmd_restbuf(&aco);
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1391,6 +1391,18 @@ def Test_readdir() eval expand('.')->readdirex({e -> e.name[0] !=# '.'}) enddef +def Test_setbufvar() + setbufvar(bufnr('%'), '&syntax', 'vim') + assert_equal('vim', &syntax) + setbufvar(bufnr('%'), '&ts', 16) + assert_equal(16, &ts) + settabwinvar(1, 1, '&syntax', 'vam') + assert_equal('vam', &syntax) + settabwinvar(1, 1, '&ts', 15) + assert_equal(15, &ts) + setlocal ts=8 +enddef + def Fibonacci(n: number): number if n < 2 return n