diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-30 18:03:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-30 18:03:10 +0200 |
| commit | 77bfd756a02c3b3150d6c08ddbf89b66362dad8d (patch) | |
| tree | a864f02a2ecc6b53300edfab99ce7217b73df102 | |
| parent | 35e802e713382d7e76232ad344af7dcd577e43de (diff) | |
| download | vim-git-77bfd756a02c3b3150d6c08ddbf89b66362dad8d.tar.gz | |
patch 8.0.1780: test fails because Vim in a terminal uses wrong 'encoding'v8.0.1780
Problem: Test fails because Vim in a terminal uses wrong 'encoding'.
Solution: Set encoding in the test where it matters. (James McCoy,
closes #2847)
| -rw-r--r-- | src/testdir/test_terminal.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |