To: vim_dev@googlegroups.com Subject: Patch 8.2.0777 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0777 (after 8.2.0776) Problem: Terminal test fails. Solution: Adjust character position for double-wide characters. Files: src/testdir/test_terminal.vim *** ../vim-8.2.0776/src/testdir/test_terminal.vim 2020-05-13 13:40:12.694995625 +0200 --- src/testdir/test_terminal.vim 2020-05-17 15:08:02.149786832 +0200 *************** *** 938,947 **** 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) " \u00a0 + composing let txt = "abc\u00a0\u0308" --- 938,947 ---- 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[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" *** ../vim-8.2.0776/src/version.c 2020-05-17 14:59:24.063410405 +0200 --- src/version.c 2020-05-17 15:09:05.637588275 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 777, /**/ -- hundred-and-one symptoms of being an internet addict: 116. You are living with your boyfriend who networks your respective computers so you can sit in separate rooms and email each other /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///