Wrap flowed lines at no more than FLOWED_MAX in replies

diff --git a/ChangeLog b/ChangeLog
index 36af4eb1d3dcfa8574482de6fe175b5bbacab5b4..14e642accd955b1bbaf0652a7cec3606c9d1f6b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2007-04-09 09:09 -0700  Brendan Cully  <brendan@kublai.com>  (9f6afccedd2f)
+2007-04-09 20:36 -0700  Michael Elkins  <me@mutt.org>  (fbe67329e688)
+
+       * main.c: Exit with a nonzero value if sending a message in batch mode
+       fails (bug #2709).
+
+       * browser.c: Use mutt_pretty_size() to format '%s' in $folder_format
+       so it is similar to '%c' in $hdr_format
+
+2007-04-09 11:32 -0700  Brendan Cully  <brendan@kublai.com>  (df7a0ee95618)
+
+       * imap/TODO: Kill off some IMAP TODO items
 
        * imap/imap.c: Null out idata->hcache when closing, and remove close
        from open failure (mx_close will handle it).

diff --git a/rfc3676.c b/rfc3676.c
index 992bb47a62967a10f3801a920be54a6a5751ef2f..1acbac053844330c3df2eab7ab147ebc0300c6cf 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -69,13 +69,13 @@ static void print_flowed_line (const char *line, STATE *s, int ql)
   char *pos, *oldpos;
   int len = mutt_strlen (line);
 
-  width = (Wrap ? mutt_term_width (Wrap) : FLOWED_MAX) - ql - 1;
-
-  if (!(s->flags & M_REPLYING))
-    --width;
-  if (width < 0)
-    width = COLS;
-
+  width = (Wrap ? mutt_term_width (Wrap) : FLOWED_MAX) - 1;
+  if (s->flags & M_REPLYING && width > FLOWED_MAX)
+    width = FLOWED_MAX;
+  /* probably want a quote_width function */
+  if (ql + 1 < width)
+    width -= ql + 1;
+    
   if (len == 0)
   {
     print_indent (ql, s);