adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.1780: test fails because Vim in a terminal uses wrong 'encoding'

Browse Source 
Problem:    Test fails because Vim in a terminal uses wrong 'encoding'.
Solution:   Set encoding in the test where it matters. (James McCoy,
            closes #2847)
This commit is contained in:
Bram Moolenaar
2018-04-30 18:03:10 +02:00
parent 35e802e713
commit 77bfd756a0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_terminal.vim
View File

@ -1011,7 +1011,7 @@ func Test_terminal_dumpwrite_composing()
let text = " a\u0300 e\u0302 o\u0308" let text = " a\u0300 e\u0302 o\u0308"
call writefile([text], 'Xcomposing') 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 WaitForAssert({-> assert_match(text, term_getline(buf, 1))})
call term_dumpwrite(buf, 'Xdump') call term_dumpwrite(buf, 'Xdump')
let dumpline = readfile('Xdump')[0] let dumpline = readfile('Xdump')[0]

2
src/version.c
View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1780,
/**/ /**/
1779, 1779,
/**/ /**/