patch 9.1.0801: tests: no error check when setting global 'termwinkey'
Commit:
https://github.com/vim/vim/commit/94606f70e2e5889feff86f0e8beacdfb88867516
Author: Milly <[email protected]>
Date: Tue Oct 22 22:07:52 2024 +0200
patch 9.1.0801: tests: no error check when setting global 'termwinkey'
Problem: tests: no error check when setting global 'termwinkey'
Solution: Also validate when using setglobal (Milly).
closes: #15917
Signed-off-by: Milly <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/optionstr.c b/src/optionstr.c
index ccba9765f..259c64cef 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -3892,9 +3892,11 @@ did_set_term_option(optset_T *args)
* The 'termwinkey' option is changed.
*/
char *
-did_set_termwinkey(optset_T *args UNUSED)
+did_set_termwinkey(optset_T *args)
{
- if (*curwin->w_p_twk != NUL && string_to_key(curwin->w_p_twk, TRUE) == 0)
+ char_u **varp = (char_u **)args->os_varp;
+
+ if ((*varp)[0] != NUL && string_to_key(*varp, TRUE) == 0)
return e_invalid_argument;
return NULL;
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index 7b0064cfd..d12191f29 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -56,7 +56,6 @@ let skip_setglobal_reasons = #{
\ shiftwidth: 'TODO: fix missing error handling for setglobal',
\ sidescrolloff: 'TODO: fix missing error handling for setglobal',
\ tabstop: 'TODO: fix missing error handling for setglobal',
- \ termwinkey: 'TODO: fix missing error handling for setglobal',
\ textwidth: 'TODO: fix missing error handling for setglobal',
\}
diff --git a/src/version.c b/src/version.c
index 404ebf5e8..1701ffb00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 801,
/**/
800,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1t3LHU-000MQY-IC%40256bit.org.
