1 files changed, 6 insertions, 6 deletions
diff --git a/pw.c b/pw.c
index f7e70ef..1b994bf 100644
--- a/pw.c
+++ b/pw.c
@@ -421,20 +421,20 @@ static void drawline(pwstate *pw, const char *line, int lineno)
         putchar(*ptr++);
       endmark = 1;
     }
-    for (; i < width; i++)
-      putchar(' ');
 
-    columns -= vsplit2;
+    if (len > vsplit2 + pw->hpos) {
+      for (; i < width; i++)
+        putchar(' ');
 
-    if (len >= vsplit2) {
+      columns -= vsplit2;
       line += vsplit2;
       len -= vsplit2;
+      endmark = 1;
     } else {
       line += len;
       len = 0;
+      endmark = (i == width);
     }
-
-    endmark = 1;
   }
 
   if (pw->hpos + 1 <= len) {