patch 9.2.0277: tests: test_modeline.vim fails

Problem:  tests: test_modeline.vim fails (after v9.2.0276)
Solution: Rewrite the tests to use the existing s:modeline_fails()
          function, update documentation (zeertzjq).

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f17f6259dbdd4220791c3e140b2e88dc6cbb3c98..604d412066ba31827e94d938b270448c7486a9fa 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 9.2.  Last change: 2026 Mar 29
+*options.txt*  For Vim version 9.2.  Last change: 2026 Apr 01
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2226,6 +2226,8 @@ A jump table for the options with a short description can be found at |Q_op|.
        Note: The match limit takes effect only during forward completion
        (CTRL-N) and is ignored during backward completion (CTRL-P).
 
+       This option cannot be set in a modeline when 'modelineexpr' is off.
+
                                                *'completefunc'* *'cfu'*
 'completefunc' 'cfu'   string  (default: empty)
                        local to buffer
@@ -4686,6 +4688,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        You can include a line break.  Simplest method is to use |:let|: >
                :let &guitabtooltip = "line one\nline two"
 <
+       This option cannot be set in a modeline when 'modelineexpr' is off.
 
                                                *'helpfile'* *'hf'*
 'helpfile' 'hf'                string  (default (MS-Windows) "$VIMRUNTIME\doc\help.txt"
@@ -6847,6 +6850,8 @@ A jump table for the options with a short description can be found at |Q_op|.
        The format of the header produced in |:hardcopy| output.
        See |pheader-option|.
 
+       This option cannot be set in a modeline when 'modelineexpr' is off.
+
                                                *'printmbcharset'* *'pmbcs'*
 'printmbcharset' 'pmbcs'  string (default "")
                        global

diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index 25ca6fb437003179e5b923c4e55d4034e20e4655..79fc7d14d584073f5275fce46e849d08ff2ca527 100644 (file)
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -261,13 +261,16 @@ endfunc
 
 func Test_modeline_fails_modelineexpr()
   call s:modeline_fails('balloonexpr', 'balloonexpr=Something()', 'E992:')
+  call s:modeline_fails('complete', "complete=FSomething", 'E992:')
   call s:modeline_fails('foldexpr', 'foldexpr=Something()', 'E992:')
   call s:modeline_fails('foldtext', 'foldtext=Something()', 'E992:')
   call s:modeline_fails('formatexpr', 'formatexpr=Something()', 'E992:')
   call s:modeline_fails('guitablabel', 'guitablabel=Something()', 'E992:')
+  call s:modeline_fails('guitabtooltip', 'guitabtooltip=Something()', 'E992:')
   call s:modeline_fails('iconstring', 'iconstring=Something()', 'E992:')
   call s:modeline_fails('includeexpr', 'includeexpr=Something()', 'E992:')
   call s:modeline_fails('indentexpr', 'indentexpr=Something()', 'E992:')
+  call s:modeline_fails('printheader', 'printheader=Something()', 'E992:')
   call s:modeline_fails('rulerformat', 'rulerformat=Something()', 'E992:')
   call s:modeline_fails('statusline', 'statusline=Something()', 'E992:')
   call s:modeline_fails('tabline', 'tabline=Something()', 'E992:')
@@ -490,29 +493,4 @@ func Test_modeline_nowrap_lcs_extends()
   set equalalways&
 endfunc
 
-func Test_modeline_forbidden()
-  let tempfile = tempname()
-  let lines =<< trim END
-    some test text for completion
-    vim: set complete=F{->system('touch_should_not_run')} :
-  END
-  call writefile(lines, tempfile, 'D')
-  call assert_fails($'new {tempfile}', 'E992:')
-  bw!
-  let lines =<< trim END
-    some text
-    vim: set guitabtooltip=%{%mapset()%}:
-  END
-  call writefile(lines, tempfile)
-  call assert_fails($'new {tempfile}', 'E992:')
-  bw!
-  let lines =<< trim END
-    some text
-    vim: set printheader=%{mapset('n',0,{})%)%}:
-  END
-  call writefile(lines, tempfile, 'D')
-  call assert_fails($'new {tempfile}', 'E992:')
-  bw!
-endfunc
-
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 708522164cf83dc9c080c85e298055ad7983adf8..075253bfd72c60c3d6c15351a4c670bc2580a11f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    277,
 /**/
     276,
 /**/