summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-11-08 20:48:05 +0100
committerChristian Brabandt <cb@256bit.org>2023-11-08 20:51:02 +0100
commit4d62a2f4439196c1cc0b2d0fc13a56dd03711b4d (patch)
treefefaac4612eab964edba63d660b4b7b9c9e0ad08 /src
parent2a94e9879283c55b162cf4e6d9ac7e0b0c35bc97 (diff)
patch 9.0.2093: Unsupported option causes skipping of modeline testv9.0.2093
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 <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_modeline.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
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
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2093,
+/**/
2092,
/**/
2091,