Skip to content

Commit 77bfd75

Browse files
committed
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)
1 parent 35e802e commit 77bfd75

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/testdir/test_terminal.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ func Test_terminal_dumpwrite_composing()
10111011

10121012
let text = " a\u0300 e\u0302 o\u0308"
10131013
call writefile([text], 'Xcomposing')
1014-
let buf = RunVimInTerminal('Xcomposing', {})
1014+
let buf = RunVimInTerminal('--cmd "set encoding=utf-8" Xcomposing', {})
10151015
call WaitForAssert({-> assert_match(text, term_getline(buf, 1))})
10161016
call term_dumpwrite(buf, 'Xdump')
10171017
let dumpline = readfile('Xdump')[0]

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1780,
764766
/**/
765767
1779,
766768
/**/

0 commit comments

Comments
 (0)