changeset 13816:9b0e4976dac6 v8.0.1780

patch 8.0.1780: test fails because Vim in a terminal uses wrong 'encoding' commit https://github.com/vim/vim/commit/77bfd756a02c3b3150d6c08ddbf89b66362dad8d Author: Bram Moolenaar <Bram@vim.org> Date: Mon Apr 30 18:03:10 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Mon, 30 Apr 2018 18:15:06 +0200
parents a9aa42f1b49b
children 49f764b1d6cc
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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]
--- 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,