<<< Date Index >>>     <<< Thread Index >>>

[PATCH] fix indent_string handling with format=flowed



Hi,

changeset:   5109:d3e0d6c60d87
branch:      HEAD
user:        Brendan Cully <brendan@xxxxxxxxxx>
date:        Tue Apr 10 13:46:09 2007 -0700
summary:     Don't use $indent_string to quote replies to flowed messages 
(closes #2874).

introduced a regression when replying to format=flowed mails.
The patch below fixes it for me (patch is against hg tree),
but please review carefully -- I know next to nothing about
mutt internals.

(Note: It would make sense to ignore $indent_string if
$text_flowed is set. My patch doesn't address this as
I'm never creating format=flowed mails, I only have to
reply to them.)


BTW, I just noticed mutt crashes when I set indent_string="|"
(single pipe character) and try to reply to a message
(independent of my patch, also happens in Debian 1.5.16 package).


Thanks,
Johannes


diff -r 709db707bcdf rfc3676.c
--- a/rfc3676.c Fri Sep 28 11:06:43 2007 +0200
+++ b/rfc3676.c Wed Oct 10 17:30:05 2007 +0200
@@ -58,7 +58,7 @@ static void print_indent (int ql, STATE 
   int i;
 
   if (s->prefix)
-    ql++;
+    state_puts (s->prefix, s);
   for (i = 0; i < ql; i++)
     state_putc ('>', s);
 }
@@ -129,8 +129,6 @@ static void print_flowed_line (const cha
     }
 
     print_indent (ql, s);
-    if (ql > 0 || s->prefix)
-      state_putc (' ', s);
     state_puts (oldpos, s);
 
     if (pos < line + len)