Even simpler header wrapping fix

diff --git a/ChangeLog b/ChangeLog
index ecb81c4cc2f09c5635c6260b6ee6dfbf87384735..4e17fdc2640b682b1d9fc63346d4db652c2f5296 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2007-04-12 17:55 -0700  Brendan Cully  <brendan@kublai.com>  (73894f3f1943)
+2007-04-13 09:21 -0700  Brendan Cully  <brendan@kublai.com>  (2c91477cac28)
+
+       * sendlib.c: Fix header wrapping
+
+2007-04-12 20:11 -0700  Brendan Cully  <brendan@kublai.com>  (c9e92a1d71cf)
+
+       * mh.c: Differentiate between first and second maildir passes in
+       progress indicator
 
        * mh.c: Only call mutt_set_flag when necessary when checking for
        maildir changes (fixes #1216)

diff --git a/sendlib.c b/sendlib.c
index dd2efa504081bbcb7da7d43ff426db19fe865e90..2620d45b3cb7352040562e3a9623c9928198b6c4 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1618,8 +1618,8 @@ int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const c
      * yuck
      */
     
-    for (i = 0, k = 0, l = 0, n = 0; i + MB_CUR_MAX < sizeof (buf) && cp[i] != '\0' &&
-        ((col < (wraplen + (k ? 0 : k)) || in_encoded_word));
+    for (i = 0, k = 0, l = 0, n = 0; i + MB_CUR_MAX < sizeof (buf)
+           && cp[i] != '\0' && ((col < wraplen || in_encoded_word));
         i += l)
     {