summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_display.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4ef361e05..199a25f1f 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -186,7 +186,7 @@ endfunc
func Test_edit_long_file_name()
CheckScreendump
- let longName = 'x'->repeat(&columns)
+ let longName = 'x'->repeat(min([&columns, 255]))
call writefile([], longName)
let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8})
diff --git a/src/version.c b/src/version.c
index cddf7704b..2ab2e074f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 6,
+/**/
5,
/**/
4,