From 0be43712709f49afb18d3b229796c36f89ed65d2 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 21 Sep 2011 09:57:13 +0000 Subject: As noticed by kristaps@, when breaking an overflowing line, forget about pending whitespace (vbl), or the next line would be misaligned and potentially too long; but i'm fixing this in a simpler way than he proposed. Also remove the kludges in .HP that compensated for this bug. --- term.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'term.c') diff --git a/term.c b/term.c index 1ee33ece..4ca15ed6 100644 --- a/term.c +++ b/term.c @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.200 2011/09/19 22:36:16 schwarze Exp $ */ +/* $Id: term.c,v 1.201 2011/09/21 09:57:13 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -184,14 +184,12 @@ term_flushln(struct termp *p) if (vend > bp && 0 == jhy && vis > 0) { vend -= vis; (*p->endline)(p); + p->viscol = 0; if (TERMP_NOBREAK & p->flags) { - p->viscol = p->rmargin; - (*p->advance)(p, p->rmargin); + vbl = p->rmargin; vend += p->rmargin - p->offset; - } else { - p->viscol = 0; + } else vbl = p->offset; - } /* Remove the p->overstep width. */ -- cgit v1.2.3