Mercurial > vim
changeset 36360:d2f436cbb06f draft v9.1.0800
patch 9.1.0800: tests: no error check when setting global 'termwinsize'
Commit: https://github.com/vim/vim/commit/8be10aa9e4f88d9cc3d0a556cb259635145a8575
Author: Milly <milly.ca@gmail.com>
Date: Tue Oct 22 22:01:46 2024 +0200
patch 9.1.0800: tests: no error check when setting global 'termwinsize'
Problem: tests: no error check when setting global 'termwinsize'
Solution: Also validate when using setglobal (Milly).
closes: #15918
Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 22 Oct 2024 22:15:03 +0200 |
| parents | c6bf161f16ef |
| children | 2ea63c4d9237 |
| files | src/optionstr.c src/testdir/gen_opt_test.vim src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/optionstr.c +++ b/src/optionstr.c @@ -3904,17 +3904,16 @@ did_set_termwinkey(optset_T *args UNUSED * The 'termwinsize' option is changed. */ char * -did_set_termwinsize(optset_T *args UNUSED) -{ +did_set_termwinsize(optset_T *args) +{ + char_u **varp = (char_u **)args->os_varp; char_u *p; - if (*curwin->w_p_tws == NUL) + if ((*varp)[0] == NUL) return NULL; - p = skipdigits(curwin->w_p_tws); - if (p == curwin->w_p_tws - || (*p != 'x' && *p != '*') - || *skipdigits(p + 1) != NUL) + p = skipdigits(*varp); + if (p == *varp || (*p != 'x' && *p != '*') || *skipdigits(p + 1) != NUL) return e_invalid_argument; return NULL;
--- a/src/testdir/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -57,7 +57,6 @@ let skip_setglobal_reasons = #{ \ sidescrolloff: 'TODO: fix missing error handling for setglobal', \ tabstop: 'TODO: fix missing error handling for setglobal', \ termwinkey: 'TODO: fix missing error handling for setglobal', - \ termwinsize: 'TODO: fix missing error handling for setglobal', \ textwidth: 'TODO: fix missing error handling for setglobal', \}