changeset 33727:2bfde43727e9 v9.0.2093

patch 9.0.2093: Unsupported option causes skipping of modeline test Commit: https://github.com/vim/vim/commit/4d62a2f4439196c1cc0b2d0fc13a56dd03711b4d Author: zeertzjq <zeertzjq@outlook.com> Date: Wed Nov 8 20:48:05 2023 +0100 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>
author Christian Brabandt <cb@256bit.org>
date Wed, 08 Nov 2023 21:00:06 +0100
parents 29042655f43b
children 1370bf12e8bf
files src/testdir/test_modeline.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,