Merge branch 'obsd-master'

Conflicts:
	server-fn.c

1 files changed, 1 insertions, 1 deletions

diff --git a/tty.c b/tty.c
index 0d1aa368..90361e3f 100644
--- a/tty.c
+++ b/tty.c
@@ -1038,7 +1038,7 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *),
 		ctx->xoff = wp->xoff;
 		ctx->yoff = wp->yoff;
 		if (status_at_line(c) == 0)
-			ctx->yoff++;
+			ctx->yoff += status_line_size(c->session);
 
 		cmdfn(&c->tty, ctx);
 	}