aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.1.0800: tests: no error check when setting global 'termwinsize'

Browse Source 
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>
This commit is contained in:
Milly
2024-10-22 22:01:46 +02:00
committed by Christian Brabandt
parent 19be0eb7f0
commit 8be10aa9e4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/optionstr.c
View File

@@ -3904,17 +3904,16 @@ did_set_termwinkey(optset_T *args UNUSED)
* The 'termwinsize' option is changed. * The 'termwinsize' option is changed.
*/ */
char * 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; char_u *p;
if (*curwin->w_p_tws == NUL) if ((*varp)[0] == NUL)
return NULL; return NULL;
p = skipdigits(curwin->w_p_tws); p = skipdigits(*varp);
if (p == curwin->w_p_tws if (p == *varp || (*p != 'x' && *p != '*') || *skipdigits(p + 1) != NUL)
|| (*p != 'x' && *p != '*')
|| *skipdigits(p + 1) != NUL)
return e_invalid_argument; return e_invalid_argument;
return NULL; return NULL;

1
src/testdir/gen_opt_test.vim
View File

@@ -57,7 +57,6 @@ let skip_setglobal_reasons = #{
\ sidescrolloff: 'TODO: fix missing error handling for setglobal', \ sidescrolloff: 'TODO: fix missing error handling for setglobal',
\ tabstop: 'TODO: fix missing error handling for setglobal', \ tabstop: 'TODO: fix missing error handling for setglobal',
\ termwinkey: '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', \ textwidth: 'TODO: fix missing error handling for setglobal',
\} \}

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
800,
/**/ /**/
799, 799,
/**/ /**/