X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=030916db1be0e45845d856a48d3758489397e4bb;hp=cae8a2e3cc5690190073fdcc99feed6d6de3d4df;hb=31edbe030ac69952aa535730427246b5e9a1603c;hpb=44f97e3b57de6d306b9a1a9b58f992b80e920213

diff --git a/handler.c b/handler.c
index cae8a2e..030916d 100644
--- a/handler.c
+++ b/handler.c
@@ -903,6 +903,12 @@ void text_enriched_handler (BODY *a, STATE *s)
 
 #define FLOWED_MAX 77
 
+#if 0
+static int flowed_maybe_quoted (char *cont)
+{
+  return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0;
+}
+
 static void flowed_quote (STATE *s, int level)
 {
   int i;
@@ -919,11 +925,6 @@ static void flowed_quote (STATE *s, int level)
     state_putc ('>', s);
 }
 
-static int flowed_maybe_quoted (char *cont)
-{
-  return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0;
-}
-
 static void flowed_stuff (STATE *s, char *cont, int level)
 {
   if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY))
@@ -966,7 +967,6 @@ static int flowed_visual_strlen (char *l, int i)
   return j;
 }
 
-#if 0
 static void text_plain_flowed_handler (BODY *a, STATE *s)
 {
   char line[LONG_STRING];
@@ -1208,7 +1208,6 @@ static int get_quote_level(char * line) {
 static void print_flowed_line(char * line, STATE *s,int ql) {
   int width;
   char * pos, * oldpos;
-  char * t;
   int len = strlen(line);
   int i;
 
@@ -1218,22 +1217,29 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
       --width;
     if (width < 0)
       width = MaxLineLength;
-  } else {
-    width = COLS - WrapMargin - ql - 1;
+  } 
+  else {
+    if (option(OPTMBOXPANE))
+      width = COLS - SidebarWidth - WrapMargin - ql - 1;
+    else
+      width = COLS - WrapMargin - ql - 1;
+    
     if (option(OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = COLS;
-  }
+  } 
 
   /* 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);
-    if (option(OPTSTUFFQUOTED))
-      state_putc(' ',s);
+    if (option (OPTQUOTEEMPTY)) {
+      if (s->prefix)
+        state_puts(s->prefix,s);
+      for (i=0;i<ql;++i) state_putc('>',s);
+      if (option(OPTSTUFFQUOTED))
+        state_putc(' ',s);
+    }
     state_putc('\n',s);
     return;
   }