runtime(syntax-tests): include missing changes
Commit:
https://github.com/vim/vim/commit/a2addebca359a35044bb60bebb91c258a94f3610
Author: Aliaksei Budavei <0x000...@gmail.com>
Date: Mon Mar 18 20:39:32 2024 +0100
runtime(syntax-tests): include missing changes
related: https://github.com/vim/vim/issues/14215
Signed-off-by: Aliaksei Budavei <0x000...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/syntax/testdir/README.txt
b/runtime/syntax/testdir/README.txt
index 40757759b..9c1264831 100644
--- a/runtime/syntax/testdir/README.txt
+++ b/runtime/syntax/testdir/README.txt
@@ -34,7 +34,7 @@ Make sure to include some interesting constructs with plenty
of complicated
highlighting. Optionally, pre-configure the testing environment by including
setup commands at the top of the input file. The format for these lines is:
- TEST_SETUP {command}
+ VIM_TEST_SETUP {command}
where {command} is any valid Ex command, which extends to the end of the line.
The first 20 lines of the input file are ALWAYS scanned for setup commands and
@@ -44,8 +44,8 @@ errors in the input file but this is not required.
Continuing the Java example:
- // TEST_SETUP let g:java_space_errors = 1
- // TEST_SETUP let g:java_minlines = 5
+ // VIM_TEST_SETUP let g:java_space_errors = 1
+ // VIM_TEST_SETUP let g:java_minlines = 5
class Test { }
As an alternative, setup commands can be included in an external Vim script
@@ -59,7 +59,7 @@ an "input/setup/java.vim" script file with the following
lines:
let g:java_minlines = 5
Both inline setup commands and setup scripts may be used at the same time, the
-script file will be sourced before any TEST_SETUP commands are executed.
+script file will be sourced before any VIM_TEST_SETUP commands are executed.
If there is no further setup required, you can now run the tests:
diff --git a/runtime/syntax/testdir/input/c.c b/runtime/syntax/testdir/input/c.c
index ede2cafb3..595721b0a 100644
--- a/runtime/syntax/testdir/input/c.c
+++ b/runtime/syntax/testdir/input/c.c
@@ -1,5 +1,5 @@
/* vi:set ts=8 sts=4 sw=4 noet:
- * TEST_SETUP let g:c_comment_strings = 1
+ * VIM_TEST_SETUP let g:c_comment_strings = 1
*
* VIM - Vi IMproved by Bram Moolenaar
*
diff --git a/runtime/syntax/testdir/runtest.vim
b/runtime/syntax/testdir/runtest.vim
index 4802315ba..e1cfdcfe1 100644
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -149,17 +149,18 @@ func RunTest()
func SetUpVim()
call cursor(1, 1)
- " Defend against rogue TEST_SETUP commands.
+ " Defend against rogue VIM_TEST_SETUP commands.
for _ in range(20)
- let lnum = search('\<TEST_SETUP\>', 'eW', 20)
+ let lnum = search('\C\<VIM_TEST_SETUP\>', 'eW', 20)
if lnum < 1
break
endif
- exe substitute(getline(lnum), '.*TEST_SETUP', '', '')
+ exe substitute(getline(lnum), '\C.*\<VIM_TEST_SETUP\>', '', '')
endfor
call cursor(1, 1)
" BEGIN [runtime/defaults.vim]
- set display=truncate ruler scrolloff=5
+ " Also, disable italic highlighting to avoid issues on some terminals.
+ set display=truncate ruler scrolloff=5 t_ZH= t_ZR=
syntax on
" END [runtime/defaults.vim]
redraw!
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rmIus-009c1d-Cs%40256bit.org.
