Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-04-23 20:01:13 +01:00
commit 9d041d8e6c

1
tty.c
View File

@ -1218,6 +1218,7 @@ tty_cmd_clearscreen(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, 0, 0); tty_cursor_pane(tty, ctx, 0, 0);