commit f06b0b6c8f85ea9c320f2be30b25ed084969c1e2
author Bram Moolenaar <Bram@vim.org> Thu Mar 29 17:22:24 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Mar 29 17:22:24 2018 +0200
tree 96efb9e8505b7eee64c6b3ea57ba55d83be50efc
parent 0751f51a5b428805a8c1e9fe529693d032bec991

patch 8.0.1652: term_dumpwrite() does not output composing characters

Problem:    term_dumpwrite() does not output composing characters.
Solution:   Use the cell index.

src/terminal.c

diff --git a/src/terminal.c b/src/terminal.c
index 5875af6..b60799d 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3573,7 +3573,7 @@
 		    for (i = 0; i < VTERM_MAX_CHARS_PER_CELL
 						  && cell.chars[i] != NUL; ++i)
 		    {
-			len = utf_char2bytes(cell.chars[0], charbuf);
+			len = utf_char2bytes(cell.chars[i], charbuf);
 			fwrite(charbuf, len, 1, fd);
 		    }
 		}

src/testdir/test_terminal.vim

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 5e817de..d0ef325 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -978,6 +978,28 @@
   call assert_equal(':popup PopUp                                   :', trim(getline(a:off + 20)))
 endfunc
 
+func Test_terminal_dumpwrite_composing()
+  if !CanRunVimInTerminal()
+    return
+  endif
+  let save_enc = &encoding
+  set encoding=utf-8
+  call assert_equal(1, winnr('$'))
+
+  let text = " a\u0300 e\u0302 o\u0308"
+  call writefile([text], 'Xcomposing')
+  let buf = RunVimInTerminal('Xcomposing', {})
+  call WaitFor({-> term_getline(buf, 1) =~ text})
+  call term_dumpwrite(buf, 'Xdump')
+  let dumpline = readfile('Xdump')[0]
+  call assert_match('|à| |ê| |ö', dumpline)
+
+  call StopVimInTerminal(buf)
+  call delete('Xcomposing')
+  call delete('Xdump')
+  let &encoding = save_enc
+endfunc
+
 " just testing basic functionality.
 func Test_terminal_dumpload()
   call assert_equal(1, winnr('$'))

src/version.c

diff --git a/src/version.c b/src/version.c
index 40746fe..b709f71 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1652,
+/**/
     1651,
 /**/
     1650,