Skip to content

Commit 142cad1

Browse files
Millychrisbra
authored andcommitted
patch 9.1.0802: tests: no error check when setting global 'fdm' to empty value
Problem: tests: no error check when setting global 'fdm' to empty value Solution: Also check global 'fdm' value for being empty (Milly). closes: #15916 Signed-off-by: Milly <milly.ca@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 94606f7 commit 142cad1

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/optionstr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,8 +2336,7 @@ did_set_foldmethod(optset_T *args)
23362336
{
23372337
char_u **varp = (char_u **)args->os_varp;
23382338

2339-
if (check_opt_strings(*varp, p_fdm_values, FALSE) != OK
2340-
|| *curwin->w_p_fdm == NUL)
2339+
if (check_opt_strings(*varp, p_fdm_values, FALSE) != OK || **varp == NUL)
23412340
return e_invalid_argument;
23422341

23432342
foldUpdateAll(curwin);

src/testdir/gen_opt_test.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ let skip_setglobal_reasons = #{
4949
\ colorcolumn: 'TODO: fix missing error handling for setglobal',
5050
\ conceallevel: 'TODO: fix missing error handling for setglobal',
5151
\ foldcolumn: 'TODO: fix missing error handling for setglobal',
52-
\ foldmethod: 'TODO: fix `setglobal fdm=` not given an error',
5352
\ iskeyword: 'TODO: fix missing error handling for setglobal',
5453
\ numberwidth: 'TODO: fix missing error handling for setglobal',
5554
\ scrolloff: 'TODO: fix missing error handling for setglobal',

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
802,
707709
/**/
708710
801,
709711
/**/

0 commit comments

Comments
 (0)