# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1525104906 -7200
# Node ID 9b0e4976dac6b82b4b02eb0a082c9375212c9c33
# Parent  a9aa42f1b49bc5f4a381b6f31bf46ab4510036f7
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)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
--- 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
--- 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,