From 4d62a2f4439196c1cc0b2d0fc13a56dd03711b4d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 8 Nov 2023 20:48:05 +0100 Subject: patch 9.0.2093: Unsupported option causes skipping of modeline test Problem: Unsupported option causes rest of modeline test to be skipped. Solution: Revert the change from patch 8.2.1432. closes: #13499 closes: #13500 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- src/testdir/test_modeline.vim | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim index 9fb233cc22..0a7240b896 100644 --- a/src/testdir/test_modeline.vim +++ b/src/testdir/test_modeline.vim @@ -164,7 +164,11 @@ func Test_modeline_colon() endfunc func s:modeline_fails(what, text, error) - call CheckOption(a:what) + " Don't use CheckOption(), it would skip the whole test + " just for a single un-supported option + if !exists('+' .. a:what) + return + endif let fname = "Xmodeline_fails_" . a:what call writefile(['vim: set ' . a:text . ' :', 'nothing'], fname, 'D') let modeline = &modeline diff --git a/src/version.c b/src/version.c index 0d46024981..405689a7cc 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 */ +/**/ + 2093, /**/ 2092, /**/ -- cgit v1.2.3