Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2020-04-18 12:01:31 +01:00
commit d55510ebc8

View File

@ -977,7 +977,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
if (x == 0) { if (x == 0) {
if (y == 0) if (y == 0)
break; break;
gl = &gd->linedata[y - 1]; gl = grid_peek_line(gd, y - 1);
if (~gl->flags & GRID_LINE_WRAPPED) if (~gl->flags & GRID_LINE_WRAPPED)
break; break;
y--; y--;
@ -993,7 +993,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
if (end == 0 || x == end - 1) { if (end == 0 || x == end - 1) {
if (y == gd->hsize + gd->sy - 1) if (y == gd->hsize + gd->sy - 1)
break; break;
gl = &gd->linedata[y]; gl = grid_peek_line(gd, y);
if (~gl->flags & GRID_LINE_WRAPPED) if (~gl->flags & GRID_LINE_WRAPPED)
break; break;
y++; y++;