Re: folded message-ids showing up weird

[Brendan Cully <brendan@xxxxxxxxxx>]

On Thursday, 12 April 2007 at 15:18, William Yardley wrote:
> In xterm and Eterm, the folded message-ids are showing up with an extra
> line for me in the new version of mutt, so like:
> 
> Message-ID: 
> 
> <!&!AAAAAAAAAAAuAAAAAAAAAKTyXRN5/+lGvU59a+P7CFMBAN6gY+ZG84BMpVQcAbDh1IQAAAATbSgA
> ABAAAABqZsCBVmeEQKRb2UdB+R1aAQAAAAA=@xxxxxxxxx>
> 
> I've seen this in the past with other long (folded) headers, like DKIM
> signatures... any easy way around it? I find it pretty unsightly.

The attached patch (in tip) works for me, but I have to say that
function is a little scary. Thomas, can you explain why you had:

col < (wraplen + (k ? 0 : wraplen)

instead of

col < wraplen

? Because that's the change I made.

diff -r c9e92a1d71cf sendlib.c
--- a/sendlib.c Thu Apr 12 20:11:49 2007 -0700
+++ b/sendlib.c Fri Apr 13 09:31:40 2007 -0700
@@ -1618,8 +1618,8 @@ int mutt_write_one_header (FILE *fp, con
      * yuck
      */
     
-    for (i = 0, k = 0, l = 0, n = 0; i + MB_CUR_MAX < sizeof (buf) && cp[i] != 
'\0' &&
-        ((col < (wraplen + (k ? 0 : wraplen)) || 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)
     {

Attachment: pgp5fzCIkvOSw.pgp
Description: PGP signature