# HG changeset patch # User Christian Brabandt # Date 1521839706 -3600 # Node ID d0d66898e98ba587c79bb21b1726fc14f08eb5ca # Parent 55d9bd45e2c1e6e8f6695e76a321fd66876c8935 patch 8.0.1632: in a terminal dump NUL and space are different commit https://github.com/vim/vim/commit/47015b80a0b0ff74ba7cb597d5959604b6e9a511 Author: Bram Moolenaar Date: Fri Mar 23 22:10:34 2018 +0100 patch 8.0.1632: in a terminal dump NUL and space are different Problem: In a terminal dump NUL and space considered are different, although they are displayed the same. Solution: When encountering NUL handle it like space. diff --git a/src/terminal.c b/src/terminal.c --- a/src/terminal.c +++ b/src/terminal.c @@ -3396,6 +3396,15 @@ f_term_dumpwrite(typval_T *argvars, typv for (i = 0; i < VTERM_MAX_CHARS_PER_CELL; ++i) { + int c = cell.chars[i]; + int pc = prev_cell.chars[i]; + + /* For the first character NUL is the same as space. */ + if (i == 0) + { + c = (c == NUL) ? ' ' : c; + pc = (pc == NUL) ? ' ' : pc; + } if (cell.chars[i] != prev_cell.chars[i]) same_chars = FALSE; if (cell.chars[i] == NUL || prev_cell.chars[i] == NUL) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1632, +/**/ 1631, /**/ 1630,