Commit: patch 9.1.1191: tests: test for patch 9.1.1186 doesn't fail without the patch

3 views
Skip to first unread message

Christian Brabandt

unread,
Mar 9, 2025, 11:30:11 AM3/9/25
to vim...@googlegroups.com
patch 9.1.1191: tests: test for patch 9.1.1186 doesn't fail without the patch

Commit: https://github.com/vim/vim/commit/d6c7913e24e07c1d0ea099cda85e0014e8627c5c
Author: zeertzjq <zeer...@outlook.com>
Date: Sun Mar 9 16:14:45 2025 +0100

patch 9.1.1191: tests: test for patch 9.1.1186 doesn't fail without the patch

Problem: Test for patch 9.1.1186 doesn't fail without the patch.
Solution: Set 'nomodeline' in the test (zeertzjq).

closes: #16835

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

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index ef21e3673..5c0ebcf2e 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 9.1. Last change: 2025 Mar 08
+*insert.txt* For Vim version 9.1. Last change: 2025 Mar 09


VIM REFERENCE MANUAL by Bram Moolenaar
@@ -663,8 +663,8 @@ Also see the 'infercase' option if you want to adjust the case of the match.

When inserting a selected candidate word from the |popup-menu|, the part of
the candidate word that does not match the query is highlighted using
-|hl-ComplMatchIns|. If fuzzy is enabled in 'completopt', highlighting will not
-be applied.
+|hl-ComplMatchIns|. If fuzzy is enabled in 'completeopt', highlighting will
+not be applied.

*complete_CTRL-E*
When completion is active you can use CTRL-E to stop it and go back to the
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 754fc8161..ae69a04e4 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1625,6 +1625,7 @@ func Test_haredoc_file()
endfunc

func Test_help_file()
+ set nomodeline
filetype on
call assert_true(mkdir('doc', 'pR'))

@@ -1639,6 +1640,7 @@ func Test_help_file()
bwipe!

filetype off
+ set modeline&
endfunc

func Test_hook_file()
diff --git a/src/version.c b/src/version.c
index fa05cd174..3e678f1f0 100644
--- 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 */
+/**/
+ 1191,
/**/
1190,
/**/
Reply all
Reply to author
Forward
0 new messages