From 7ec2a2b9ce0d7045c604607f4fa28b380f8f37f8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 21 Aug 2017 21:01:21 +0000
Subject: [PATCH] Do not emit \r\n to move to column 0 if there are margins,
 because it will instead move to the margin left.

---
 tty.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tty.c b/tty.c
index d83d4ced..68714cb9 100644
--- a/tty.c
+++ b/tty.c
@@ -1609,7 +1609,8 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
 	}
 
 	/* Zero on the next line. */
-	if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower) {
+	if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower &&
+	    (!tty_use_margin(tty) || tty->rleft == 0)) {
 		tty_putc(tty, '\r');
 		tty_putc(tty, '\n');
 		goto out;