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 c9d463715..0f7234665 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1011,7 +1011,7 @@ func Test_terminal_dumpwrite_composing()
let text = " a\u0300 e\u0302 o\u0308"
call writefile([text], 'Xcomposing')
- let buf = RunVimInTerminal('Xcomposing', {})
+ let buf = RunVimInTerminal('--cmd "set encoding=utf-8" Xcomposing', {})
call WaitForAssert({-> assert_match(text, term_getline(buf, 1))})
call term_dumpwrite(buf, 'Xdump')
let dumpline = readfile('Xdump')[0]
diff --git a/src/version.c b/src/version.c
index 1f360869e..7726f8450 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 */
/**/
+ 1780,
+/**/
1779,
/**/
1778,