Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-02-15 12:01:15 +00:00
commit c9f2dc5ee5

1
tty.c
View File

@ -1031,6 +1031,7 @@ tty_cmd_clearendofscreen(struct tty *tty, const struct tty_ctx *ctx)
tty_margin_off(tty); tty_margin_off(tty);
if (tty_pane_full_width(tty, ctx) && if (tty_pane_full_width(tty, ctx) &&
ctx->yoff + wp->sy >= tty->sy - 1 &&
status_at_line(tty->client) <= 0 && status_at_line(tty->client) <= 0 &&
tty_term_has(tty->term, TTYC_ED)) { tty_term_has(tty->term, TTYC_ED)) {
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy); tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);