Move the check for whether to force a line wrapper lower down into the tty code

where it has access to the tty width, which is what should have been checked.

1 files changed, 8 insertions, 0 deletions

diff --git a/tty.c b/tty.c
index 9f4fbc2e..93d61c0e 100644
--- a/tty.c
+++ b/tty.c
@@ -713,6 +713,14 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
 		return;
 	}
 
+	/*
+	 * If this line wrapped naturally (ctx->num is nonzero), don't do
+	 * anything - the cursor can just be moved to the last cell and wrap
+	 * naturally.
+	 */
+	if (ctx->num && !(tty->term->flags & TERM_EARLYWRAP))
+		return;
+
 	if (ctx->ocy == ctx->orlower) {
 		tty_reset(tty);