Fix space-before-newline (inspired by schwarze@openbsd.org).

1 files changed, 4 insertions, 5 deletions

diff --git a/term.c b/term.c
index bc161bbb..37fb1fa9 100644
--- a/term.c
+++ b/term.c
@@ -278,16 +278,15 @@ term_flushln(struct termp *p)
 		 * our breakpoint.
 		 */
 
+		if (0 < vis++)
+			putchar(' ');
+
 		for ( ; i < (int)p->col; i++) {
 			if (' ' == p->buf[i])
 				break;
 			putchar(p->buf[i]);
 		}
 		vis += vsz;
-		if (i < (int)p->col && vis <= bp) {
-			putchar(' ');
-			vis++;
-		}
 	}
 
 	/*
@@ -312,7 +311,7 @@ term_flushln(struct termp *p)
 
 	if (p->flags & TERMP_NOBREAK) {
 		if ( ! (TERMP_NONOBREAK & p->flags))
-			for ( ; vis < maxvis; vis++)
+			for ( ; vis <= maxvis; vis++)
 				putchar(' ');
 	} else
 		putchar('\n');