Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-11-15 20:01:22 +00:00
5 changed files with 293 additions and 197 deletions

View File

@ -469,14 +469,5 @@ screen_select_cell(struct screen *s, struct grid_cell *dst,
static void
screen_reflow(struct screen *s, u_int new_x)
{
struct grid *old = s->grid;
u_int change;
s->grid = grid_create(old->sx, old->sy, old->hlimit);
change = grid_reflow(s->grid, old, new_x);
if (change < s->cy)
s->cy -= change;
else
s->cy = 0;
grid_reflow(s->grid, new_x, &s->cy);
}