git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@59 e385b8ad-14ed-0310-8656-cc95a2468c6d

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index e53ca37..09556d1 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -16,6 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 

+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>


@@ -1216,7 +1220,11 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
   /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
 
   if (strlen(line)==0) {
   /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
 
   if (strlen(line)==0) {

+    if (s->prefix)
+      state_puts(s->prefix,s);

     for (i=0;i<ql;++i) state_putc('>',s);
     for (i=0;i<ql;++i) state_putc('>',s);

+    if (option(OPTSTUFFQUOTED))
+      state_putc(' ',s);

     state_putc('\n',s);
     return;
   }
     state_putc('\n',s);
     return;
   }


@@ -1257,11 +1265,15 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
     } else {
       /* fprintf(stderr,"if 1 else\n"); */
     }
     } else {
       /* fprintf(stderr,"if 1 else\n"); */
     }

+    if (s->prefix)
+      state_puts(s->prefix,s);

     for (i=0;i<ql;++i)
       state_putc('>',s);
     for (i=0;i<ql;++i)
       state_putc('>',s);

-    if (option(OPTSTUFFQUOTED) && ql>0) state_putc(' ',s);
+    if (option(OPTSTUFFQUOTED) && (ql>0 || s->prefix)) state_putc(' ',s);

     state_puts(oldpos,s);
     /* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */
     state_puts(oldpos,s);
     /* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */

+    if (pos<line+len)
+      state_putc(' ',s);

     state_putc('\n',s);
     oldpos = pos;
   }
     state_putc('\n',s);
     oldpos = pos;
   }