patch 9.2.0924: tests: Test_termwinscroll() fails on FreeBSD

Problem:  tests: Test_termwinscroll() fails on FreeBSD
Solution: Explicitly disable line-editor feature (neil).

closes: #20966

Supported by AI.

Signed-off-by: neil <github@neilpang.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim
index 41ef3c5f66fda657ad8c4cc43d2899b2de1fd7e5..6223869d213221237bc81e485a2e9fada9c50093 100644 (file)
--- a/src/testdir/test_terminal2.vim
+++ b/src/testdir/test_terminal2.vim
@@ -224,6 +224,11 @@ func Test_termwinscroll()
   exe 'set termwinscroll=' . &lines
   let buf = term_start('/bin/sh')
   call TermWait(buf)
+  " Some shells enable a line editor when interactive on a terminal,
+  " which echoes the typed line a second time; "+o" is a no-op on
+  " shells that have none.
+  call feedkeys("set +o emacs\<CR>", 'xt')
+  call TermWait(buf)
   for i in range(1, &lines)
     call feedkeys("echo " . i . "\<CR>", 'xt')
     call WaitForAssert({-> assert_match(string(i), term_getline(buf, term_getcursor(buf)[0] - 1))})

diff --git a/src/version.c b/src/version.c
index d1a1f6689e5cdcc43ceac72dde0f27846c23fb0f..c0bd2936584ea259ac03d288a5d1a704799504fc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    924,
 /**/
     923,
 /**/