summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_terminal.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index d0f143850..0f6a50162 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -757,6 +757,7 @@ func Test_terminal_write_stdin()
" TODO: enable once writing to stdin works on MS-Windows
CheckNotMSWindows
CheckExecutable wc
+ let g:test_is_flaky = 1
call setline(1, ['one', 'two', 'three'])
%term wc
@@ -775,6 +776,7 @@ endfunc
func Test_terminal_eof_arg()
call CheckPython(s:python)
+ let g:test_is_flaky = 1
call setline(1, ['print("hello")'])
exe '1term ++eof=exit(123) ' .. s:python
@@ -793,6 +795,7 @@ endfunc
func Test_terminal_eof_arg_win32_ctrl_z()
CheckMSWindows
call CheckPython(s:python)
+ let g:test_is_flaky = 1
call setline(1, ['print("hello")'])
exe '1term ++eof=<C-Z> ' .. s:python
@@ -803,8 +806,9 @@ endfunc
func Test_terminal_duplicate_eof_arg()
call CheckPython(s:python)
+ let g:test_is_flaky = 1
- " Check the last specified ++eof arg is used and should not memory leak.
+ " Check the last specified ++eof arg is used and does not leak memory.
new
call setline(1, ['print("hello")'])
exe '1term ++eof=<C-Z> ++eof=exit(123) ' .. s:python
diff --git a/src/version.c b/src/version.c
index 5fdc9fd77..e9cfe7c2f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5099,
+/**/
5098,
/**/
5097,