To: vim_dev@googlegroups.com Subject: Patch 8.0.1780 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: src/testdir/test_terminal.vim *** ../vim-8.0.1779/src/testdir/test_terminal.vim 2018-04-30 14:28:20.448618066 +0200 --- src/testdir/test_terminal.vim 2018-04-30 18:01:27.268886833 +0200 *************** *** 1011,1017 **** let text = " a\u0300 e\u0302 o\u0308" call writefile([text], 'Xcomposing') ! let buf = RunVimInTerminal('Xcomposing', {}) call WaitForAssert({-> assert_match(text, term_getline(buf, 1))}) call term_dumpwrite(buf, 'Xdump') let dumpline = readfile('Xdump')[0] --- 1011,1017 ---- let text = " a\u0300 e\u0302 o\u0308" call writefile([text], '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] *** ../vim-8.0.1779/src/version.c 2018-04-30 17:20:58.937028966 +0200 --- src/version.c 2018-04-30 18:02:23.276517663 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1780, /**/ -- Not too long ago, a program was something you watched on TV... /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///