From f8c93b1ec6f9c8356e5c368cbf9963ce0900b35d Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Thu, 21 Jun 2018 00:25:35 -0500
Subject: Tweak fmt width calculation.

---
 toys/pending/fmt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'toys')

diff --git a/toys/pending/fmt.c b/toys/pending/fmt.c
index 64df69da..a3d30f02 100644
--- a/toys/pending/fmt.c
+++ b/toys/pending/fmt.c
@@ -74,15 +74,15 @@ static void fmt_line(char **pline, long len)
     while (idx<len && !isspace(line[idx])) idx++;
     line[idx++] = 0;
     count = utf8len(word);
-    if (TT.pos+count>=TT.width) newline();
+    if (TT.pos+count+!!TT.pos>=TT.width) newline();
 
     // When indenting a new line, preserve tab/space mixture of input
     if (!TT.pos) {
-      TT.pos = TT.level-1;
+      TT.pos = TT.level;
       if (indent) printf("%.*s", indent, line);
-    }
-    printf(" %s"+!(TT.pos!=TT.level-1), word);
-    TT.pos += count+1;
+    } else count++;
+    printf(" %s"+!(TT.pos!=TT.level), word);
+    TT.pos += count;
     while (isspace(line[idx])) idx++;
   }
 }
-- 
cgit v1.2.3