Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-04-01 21:02:37 +01:00
commit 294accea1b

2
grid.c
View File

@ -1284,6 +1284,8 @@ grid_reflow(struct grid *gd, u_int sx)
if (target->sy < gd->sy) if (target->sy < gd->sy)
grid_reflow_add(target, gd->sy - target->sy); grid_reflow_add(target, gd->sy - target->sy);
gd->hsize = target->sy - gd->sy; gd->hsize = target->sy - gd->sy;
if (gd->hscrolled > gd->hsize)
gd->hscrolled = gd->hsize;
free(gd->linedata); free(gd->linedata);
gd->linedata = target->linedata; gd->linedata = target->linedata;
free(target); free(target);