diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c3753f197f..99e4e70a3a 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.2. Last change: 2026 May 08 +*options.txt* For Vim version 9.2. Last change: 2026 May 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -6216,6 +6216,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'filetype' 'foldcolumn' 'foldenable' + 'foldmarker' 'foldmethod' 'modifiable' 'readonly' diff --git a/src/option.c b/src/option.c index 4197d4d8b7..31f84c98d1 100644 --- a/src/option.c +++ b/src/option.c @@ -1554,6 +1554,7 @@ static char *modeline_whitelist[] = "filetype", "foldcolumn", "foldenable", + "foldmarker", "foldmethod", "modifiable", "readonly", diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim index 6884ab473d..cb489ee15f 100644 --- a/src/testdir/test_modeline.vim +++ b/src/testdir/test_modeline.vim @@ -563,11 +563,12 @@ func Test_modeline_strict_allowed() set modeline modelinestrict " Whitelisted options should work - call writefile(['vim: set ts=2 sw=4 et :'], 'Xmodeline_strict', 'D') + call writefile(['vim: set ts=2 sw=4 et foldmarker=[,]:'], 'Xmodeline_strict', 'D') split Xmodeline_strict call assert_equal(2, &ts) call assert_equal(4, &sw) call assert_equal(1, &et) + call assert_equal('[,]', &foldmarker) bwipe! " 'filetype' should work diff --git a/src/version.c b/src/version.c index 339bc44593..102a0d4eb4 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 465, /**/ 464, /**/