Disable many "stupid" CLI options or some that will have better equivalents soon...

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 30434af..d3a3773 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -12,7 +12,7 @@
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-sys/unix.h>
 
@@ -639,9 +639,8 @@ static int text_enriched_handler (BODY * a, STATE * s)
 
   p_clear(&stte, 1);
   stte.s = s;
-  stte.WrapMargin =
-    ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
-                                            72) ? (COLS - 4) : 72);
+  stte.WrapMargin = ((s->flags & M_DISPLAY) ? (getmaxx(main_w) - 4) :
+                     ((getmaxx(main_w) - 4) < 72) ? (getmaxx(main_w) - 4) : 72);
   stte.line_max = stte.WrapMargin * 4;
   stte.line = p_new(char, stte.line_max + 1);
   stte.param = p_new(char, STRING);
@@ -1027,8 +1026,7 @@ static int multipart_handler (BODY * a, STATE * s)
     }
     rc = mutt_body_handler (p, s);
     state_putc ('\n', s);
-    if (rc || ((s->flags & M_REPLYING)
-        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
+    if (rc)
       break;
   }
 
@@ -1438,7 +1436,6 @@ int mutt_body_handler (BODY * b, STATE * s)
         s->fpin = fp;
       }
     }
-    s->flags |= M_FIRSTDONE;
   }
   else if (s->flags & M_DISPLAY) {
     state_mark_attach (s);
@@ -1455,7 +1452,6 @@ int mutt_body_handler (BODY * b, STATE * s)
   }
 
 bail:
-  s->flags = oflags | (s->flags & M_FIRSTDONE);
-
+  s->flags = oflags;
   return (rc);
 }