Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2020-05-27 08:01:19 +01:00
commit 38ce6adab6
2 changed files with 1 additions and 2 deletions

1
grid.c
View File

@ -541,7 +541,6 @@ grid_set_cell(struct grid *gd, u_int px, u_int py, const struct grid_cell *gc)
gl->cellused = px + 1; gl->cellused = px + 1;
gce = &gl->celldata[px]; gce = &gl->celldata[px];
if (gc->flags & GRID_FLAG_PADDING) log_debug("!!! padding %d\n", grid_need_extended_cell(gce, gc));
if (grid_need_extended_cell(gce, gc)) if (grid_need_extended_cell(gce, gc))
grid_extended_cell(gl, gce, gc); grid_extended_cell(gl, gce, gc);
else else

View File

@ -39,7 +39,7 @@ static const struct grid_cell *screen_write_combine(struct screen_write_ctx *,
const struct utf8_data *, u_int *); const struct utf8_data *, u_int *);
static const struct grid_cell screen_write_pad_cell = { static const struct grid_cell screen_write_pad_cell = {
{ { 0 }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 0 { { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_PADDING, 8, 8, 0
}; };
struct screen_write_collect_item { struct screen_write_collect_item {