diff options
| -rw-r--r-- | src/testdir/test_substitute.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim index 32e2f27854..73e6bef58d 100644 --- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -1415,18 +1415,19 @@ func Test_substitute_short_cmd() endfunc " Check handling expanding "~" resulting in extremely long text. -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 +" 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 " 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 97530bfa8c..1665096443 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 */ /**/ + 1534, +/**/ 1533, /**/ 1532, |