From 79ea680e6b1dd02035fdf8a5521927cf1f98c2ed Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 17 May 2020 15:09:27 +0200 Subject: [PATCH] patch 8.2.0777: terminal test fails Problem: Terminal test fails. Solution: Adjust character position for double-wide characters. --- src/testdir/test_terminal.vim | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 33ff52fa48..ab1961aa37 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -938,10 +938,10 @@ func Test_terminal_composing_unicode() call WaitForAssert({-> assert_equal(txt, term_getline(buf, lnum[1] + 1))}, 1000) let l = term_scrape(buf, lnum[1] + 1) call assert_equal("\u304b\u3099", l[0].chars) - call assert_equal("\u304e", l[1].chars) - call assert_equal("\u304f\u3099", l[2].chars) - call assert_equal("\u3052", l[3].chars) - call assert_equal("\u3053\u3099", l[4].chars) + call assert_equal("\u304e", l[2].chars) + call assert_equal("\u304f\u3099", l[3].chars) + call assert_equal("\u3052", l[5].chars) + call assert_equal("\u3053\u3099", l[6].chars) " \u00a0 + composing let txt = "abc\u00a0\u0308" diff --git a/src/version.c b/src/version.c index ccd564475c..b7e6d5caf8 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 777, /**/ 776, /**/