thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1632: in a terminal dump NUL and space are different

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2018-03-23 22:10:34 +01:00
parent 948a796bfe
commit 47015b80a0
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/terminal.c
View File

@@ -3396,6 +3396,15 @@ f_term_dumpwrite(typval_T *argvars, typval_T *rettv UNUSED)
for (i = 0; i < VTERM_MAX_CHARS_PER_CELL; ++i) 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]) if (cell.chars[i] != prev_cell.chars[i])
same_chars = FALSE; same_chars = FALSE;
if (cell.chars[i] == NUL || prev_cell.chars[i] == NUL) if (cell.chars[i] == NUL || prev_cell.chars[i] == NUL)

2
src/version.c
View File

@@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1632,
/**/ /**/
1631, 1631,
/**/ /**/