From e487b87f6f5bb862f9b185f3791b99fa99083ce9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 20 Feb 2013 09:34:21 +0000 Subject: [PATCH] Clear last attributes after reset in string_cells, from George Nachman. --- grid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grid.c b/grid.c index 3c32f224..71778224 100644 --- a/grid.c +++ b/grid.c @@ -511,6 +511,7 @@ grid_string_cells_code(const struct grid_cell *lastgc, for (i = 0; i < nitems(attrs); i++) { if (!(attr & attrs[i].mask) && (lastattr & attrs[i].mask)) { s[n++] = 0; + lastattr &= GRID_ATTR_CHARSET; break; } } @@ -523,7 +524,8 @@ grid_string_cells_code(const struct grid_cell *lastgc, /* If the foreground c changed, append its parameters. */ nnewc = grid_string_cells_fg(gc, newc); noldc = grid_string_cells_fg(lastgc, oldc); - if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { + if (nnewc != noldc || + memcmp(newc,oldc, nnewc * sizeof newc[0]) != 0) { for (i = 0; i < nnewc; i++) s[n++] = newc[i]; } @@ -531,7 +533,8 @@ grid_string_cells_code(const struct grid_cell *lastgc, /* If the background c changed, append its parameters. */ nnewc = grid_string_cells_bg(gc, newc); noldc = grid_string_cells_bg(lastgc, oldc); - if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { + if (nnewc != noldc || + memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { for (i = 0; i < nnewc; i++) s[n++] = newc[i]; }