ps - These are the two versions of the gj one I have - one might have
been tweaked by me to apply to a later version. It's pretty small; I
imagine someone who knows the mutt code-base could pretty easily figure
out how to make it apply to current.
w
--- PATCHES.orig 2003-04-15 06:18:34.000000000 -0700
+++ PATCHES 2003-12-31 00:13:58.000000000 -0800
@@ -1,0 +1 @@
+patch-1.5.5.1.gj.stuff_all_quoted.2
--- handler.c.orig 2003-11-05 01:41:31.000000000 -0800
+++ handler.c 2004-02-23 03:21:10.000000000 -0800
@@ -919,9 +919,6 @@
static void flowed_stuff (STATE *s, char *cont, int level)
{
- if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY))
- return;
-
if (s->flags & M_DISPLAY)
{
/*
@@ -931,7 +928,15 @@
*/
if (*cont && !level && !mutt_strcmp (Pager, "builtin") &&
flowed_maybe_quoted (cont))
state_puts ("\033[0m",s);
+
+ if (*cont && level && option (OPTSTUFFALLQUOTED))
+ state_putc (' ', s);
}
+ else if (option (OPTSTUFFALLQUOTED) && *cont &&
+ ((s->prefix && s->prefix[strlen(s->prefix) - 1] == ' ') ? level - 1
: level))
+ state_putc (' ', s);
+ else if (!option (OPTTEXTFLOWED))
+ return;
else if ((!(s->flags & M_PRINTING)) &&
((*cont == ' ') || (*cont == '>') || (!level && !mutt_strncmp (cont,
"From ", 5))))
state_putc (' ', s);
--- init.h.orig 2003-11-05 01:41:32.000000000 -0800
+++ init.h 2004-01-15 23:51:31.000000000 -0800
@@ -2492,6 +2492,16 @@
** personal mailbox where you might have several unrelated messages with
** the subject ``hi'' which will get grouped together.
*/
+ { "stuff_all_quoted", DT_BOOL, R_NONE, OPTSTUFFALLQUOTED, 0 },
+ /*
+ ** .pp
+ ** When set, mutt will space-stuff all non-empty quoted lines in
+ ** displayed and generated text/plain; format=flowed attachments, as
+ ** allowed by RFC 2646. This makes the quoting of format=flowed text
+ ** easier to read and more consistent with the quoting style
+ ** traditionally used for format=fixed text. When unset, mutt will
+ ** space-stuff quoted lines only as required by RFC 2646.
+ */
{ "suspend", DT_BOOL, R_NONE, OPTSUSPEND, 1 },
/*
** .pp
--- mutt.h.orig 2003-11-05 01:41:32.000000000 -0800
+++ mutt.h 2003-12-30 16:56:43.000000000 -0800
@@ -406,6 +406,7 @@
OPTSTATUSONTOP,
OPTSTRICTTHREADS,
OPTSUSPEND,
+ OPTSTUFFALLQUOTED,
OPTTEXTFLOWED,
OPTTHOROUGHSRC,
OPTTHREADRECEIVED,
diff -u mutt-1.5.12/PATCHES mutt-1.5.12.patched/PATCHES
--- mutt-1.5.12/PATCHES 2006-07-14 11:12:47.000000000 -0700
+++ mutt-1.5.12.patched/PATCHES 2006-08-07 23:20:25.000000000 -0700
@@ -0,0 +1 @@
+patch-1.5.5.1.gj.stuff_all_quoted.2
Common subdirectories: mutt-1.5.12/contrib and mutt-1.5.12.patched/contrib
Common subdirectories: mutt-1.5.12/doc and mutt-1.5.12.patched/doc
diff -u mutt-1.5.12/handler.c mutt-1.5.12.patched/handler.c
--- mutt-1.5.12/handler.c 2005-12-20 01:36:02.000000000 -0800
+++ mutt-1.5.12.patched/handler.c 2006-08-07 23:20:25.000000000 -0700
@@ -924,9 +924,6 @@
static void flowed_stuff (STATE *s, char *cont, int level)
{
- if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY))
- return;
-
if (s->flags & M_DISPLAY)
{
/*
@@ -936,7 +933,15 @@
*/
if (*cont && !level && !mutt_strcmp (Pager, "builtin") &&
flowed_maybe_quoted (cont))
state_puts ("\033[0m",s);
+
+ if (*cont && level && option (OPTSTUFFALLQUOTED))
+ state_putc (' ', s);
}
+ else if (option (OPTSTUFFALLQUOTED) && *cont &&
+ ((s->prefix && s->prefix[strlen(s->prefix) - 1] == ' ') ? level - 1
: level))
+ state_putc (' ', s);
+ else if (!option (OPTTEXTFLOWED))
+ return;
else if ((!(s->flags & M_PRINTING)) &&
((*cont == ' ') || (*cont == '>') || (!level && !mutt_strncmp (cont,
"From ", 5))))
state_putc (' ', s);
Only in mutt-1.5.12.patched/: handler.c.orig
Common subdirectories: mutt-1.5.12/imap and mutt-1.5.12.patched/imap
diff -u mutt-1.5.12/init.h mutt-1.5.12.patched/init.h
--- mutt-1.5.12/init.h 2006-07-05 01:40:05.000000000 -0700
+++ mutt-1.5.12.patched/init.h 2006-08-07 23:20:25.000000000 -0700
@@ -2728,6 +2728,16 @@
** ``$$sort_re'' for a less drastic way of controlling this
** behaviour.
*/
+ { "stuff_all_quoted", DT_BOOL, R_NONE, OPTSTUFFALLQUOTED, 0 },
+ /*
+ ** .pp
+ ** When set, mutt will space-stuff all non-empty quoted lines in
+ ** displayed and generated text/plain; format=flowed attachments, as
+ ** allowed by RFC 2646. This makes the quoting of format=flowed text
+ ** easier to read and more consistent with the quoting style
+ ** traditionally used for format=fixed text. When unset, mutt will
+ ** space-stuff quoted lines only as required by RFC 2646.
+ */
{ "suspend", DT_BOOL, R_NONE, OPTSUSPEND, 1 },
/*
** .pp
Only in mutt-1.5.12.patched/: init.h.orig
Common subdirectories: mutt-1.5.12/intl and mutt-1.5.12.patched/intl
Common subdirectories: mutt-1.5.12/m4 and mutt-1.5.12.patched/m4
diff -u mutt-1.5.12/mutt.h mutt-1.5.12.patched/mutt.h
--- mutt-1.5.12/mutt.h 2006-06-08 04:49:07.000000000 -0700
+++ mutt-1.5.12.patched/mutt.h 2006-08-07 23:20:25.000000000 -0700
@@ -427,6 +427,7 @@
OPTSTATUSONTOP,
OPTSTRICTTHREADS,
OPTSUSPEND,
+ OPTSTUFFALLQUOTED,
OPTTEXTFLOWED,
OPTTHOROUGHSRC,
OPTTHREADRECEIVED,
Only in mutt-1.5.12.patched/: mutt.h.orig
Common subdirectories: mutt-1.5.12/po and mutt-1.5.12.patched/po
