From 77bfd756a02c3b3150d6c08ddbf89b66362dad8d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 30 Apr 2018 18:03:10 +0200 Subject: [PATCH] patch 8.0.1780: test fails because Vim in a terminal uses wrong 'encoding' Problem: Test fails because Vim in a terminal uses wrong 'encoding'. Solution: Set encoding in the test where it matters. (James McCoy, closes #2847) --- src/testdir/test_terminal.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index c9d4637155..0f72346652 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 1f360869e7..7726f8450b 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1780, /**/ 1779, /**/ -- 2.47.2