diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-17 15:09:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-17 15:09:27 +0200 |
| commit | 79ea680e6b1dd02035fdf8a5521927cf1f98c2ed (patch) | |
| tree | 0337ea650d83b43f4ce2460707b7ae5377852d46 | |
| parent | e178ba36546ec7805020280910306331f1ef4ed0 (diff) | |
| download | vim-git-79ea680e6b1dd02035fdf8a5521927cf1f98c2ed.tar.gz | |
patch 8.2.0777: terminal test failsv8.2.0777
Problem: Terminal test fails.
Solution: Adjust character position for double-wide characters.
| -rw-r--r-- | src/testdir/test_terminal.vim | 8 | ||||
| -rw-r--r-- | 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 33ff52fa4..ab1961aa3 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 ccd564475..b7e6d5caf 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 777, +/**/ 776, /**/ 775, |