Commit: patch 9.1.1093: tests: output of test ...win32_ctrl_z depends on python version

[Christian Brabandt]

patch 9.1.1093: tests: output of test ...win32_ctrl_z depends on python version

Commit: https://github.com/vim/vim/commit/3cfac59f926adadf8ec504730ea8876b17bea457
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Feb 9 17:22:30 2025 +0100

patch 9.1.1093: tests: output of test ...win32_ctrl_z depends on python version

Problem: tests: output of test Test_terminal_eof_arg_win32_ctrl_z depends on python
version.
Solution: Check for the expected output in both, the second last line
and last line

It seems python 3.13 changed the output a bit and there is no longer a
trailing blank line. So to keep compatible with python < 3.13, let's
check for the expected output in either the last line and the second
last line.

closes: #16599

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 89a8abc3b..d3744fab1 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -963,8 +963,10 @@ func Test_terminal_eof_arg_win32_ctrl_z()

call setline(1, ['print("hello")'])
exe '1term ++eof=<C-Z> ' .. s:python
- call WaitForAssert({-> assert_match('\^Z', getline(line('$') - 1))})
- call assert_match('\^Z', getline(line('$') - 1))
+ call WaitForAssert({-> assert_match('\^Z', getline(line('$') - 1) .. getline(line('$')))})
+ " until python 3.12 there was an extra line break, with 3.13 it was removed,
+ " so depending on the python version the ^Z is on the last or second-last line
+ call assert_match('\^Z', getline(line('$') - 1) .. getline(line('$')))
%bwipe!
endfunc

diff --git a/src/version.c b/src/version.c
index fe43fd447..1bc3bcccb 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 */
+/**/
+ 1093,
/**/
1092,
/**/