patch 8.2.0777: terminal test fails

Problem:    Terminal test fails.
Solution:   Adjust character position for double-wide characters.

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 33ff52fa489cec6175a11949bb6ebf0165920fdf..ab1961aa37ab8aab6ede024689178355d18e6b4a 100644 (file)
--- 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 ccd564475c7b58b85581a01f94b668b3b145cc95..b7e6d5caf82c0bfc14f56c89d96dfe2e28a90464 100644 (file)
--- 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,
 /**/