diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-05-09 22:07:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-09 22:07:11 +0100 |
| commit | a4467c433a767cc2dc046ff134094c1b6305b678 (patch) | |
| tree | 69f5ac25bc00a46faef006b56b413c4a6f937fa4 | |
| parent | 916d6dd5b1834293e21a72ef70175aae57e78fba (diff) | |
| download | vim-git-a4467c433a767cc2dc046ff134094c1b6305b678.tar.gz | |
patch 9.0.1535: test commented out in a wrong wayv9.0.1535
Problem: Test commented out in a wrong way.
Solution: Use legacy script comment character.
| -rw-r--r-- | src/testdir/test_substitute.vim | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim index 73e6bef58..3565c530e 100644 --- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1416,18 +1416,18 @@ endfunc " Check handling expanding "~" resulting in extremely long text. " FIXME: disabled, it takes too long to run on CI -#func Test_substitute_tilde_too_long() -# enew! -# -# s/.*/ixxx -# s//~~~~~~~~~AAAAAAA@( -# -# " Either fails with "out of memory" or "text too long". -# " This can take a long time. -# call assert_fails('sil! norm &&&&&&&&&', ['E1240:\|E342:']) -# -# bwipe! -#endfunc +"func Test_substitute_tilde_too_long() +" enew! +" +" s/.*/ixxx +" s//~~~~~~~~~AAAAAAA@( +" +" " Either fails with "out of memory" or "text too long". +" " This can take a long time. +" call assert_fails('sil! norm &&&&&&&&&', ['E1240:\|E342:']) +" +" bwipe! +"endfunc " This should be done last to reveal a memory leak when vim_regsub_both() is " called to evaluate an expression but it is not used in a second call. diff --git a/src/version.c b/src/version.c index 166509644..8da355b33 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1535, +/**/ 1534, /**/ 1533, |