changeset 20445:9f34aae7f69d v8.2.0777

patch 8.2.0777: terminal test fails Commit: https://github.com/vim/vim/commit/79ea680e6b1dd02035fdf8a5521927cf1f98c2ed Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 17 15:09:27 2020 +0200 patch 8.2.0777: terminal test fails Problem: Terminal test fails. Solution: Adjust character position for double-wide characters.
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 May 2020 15:15:04 +0200
parents 82b4ce621577
children 352c15b925c2
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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,