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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index 9fb233cc22da49a43677a089076a3668a0366a2a..0a7240b89651baaddeb665bba4ccdadb4376dd82 100644 (file)
--- 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 0d460249816ce345fb0ca46032df9990b0ec0c73..405689a7cc9ef99202661d7cfe835dc44307b8bf 100644 (file)
--- 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,
 /**/