summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index c4e49b730..4cd77572e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -270,7 +270,7 @@ func Test_terminal_scroll()
endfunc
func Test_terminal_scrollback()
- let buf = Run_shell_in_terminal({})
+ let buf = Run_shell_in_terminal({'term_rows': 15})
set termwinscroll=100
call writefile(range(150), 'Xtext')
if has('win32')
diff --git a/src/version.c b/src/version.c
index dce336e0e..72960f3ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 26,
+/**/
25,
/**/
24,