Update to latest madtty.

[apps/madmutt.git] / recvattach.c

diff --git a/recvattach.c b/recvattach.c
index 91d6434..2ca1964 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -14,7 +14,6 @@
 #include <lib-sys/unix.h>
 
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -110,7 +109,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
   if (level == 0)
     mutt_update_tree (idx, *idxlen);
 
-  return (idx);
+  return idx;
 }
 
 /* %c = character set: convert?
@@ -483,10 +482,8 @@ mutt_query_pipe_attachment(char *command, FILE * fp, BODY * body, int afilter)
     snprintf(warning, sizeof (warning),
              _("WARNING!  You are about to overwrite %s, continue?"),
              body->filename);
-    if (mutt_yesorno (warning, M_NO) != M_YES) {
-      CLEARLINE(main_w, LINES - 1);
+    if (mutt_yesorno (warning, M_NO) != M_YES)
       return;
-    }
     tempfd = m_tempfd(tfile, sizeof(tfile), NONULL(mod_core.tmpdir), NULL);
   }
 
@@ -591,7 +588,7 @@ static int can_print(BODY * top, int tag)
       }
     }
     else if (top->parts)
-      return (can_print(top->parts, tag));
+      return can_print(top->parts, tag);
     if (!tag)
       break;
   }
@@ -965,15 +962,6 @@ void mutt_view_attachments (HEADER * hdr)
         break;
       }
 
-#ifdef USE_NNTP
-      if (Context->magic == M_NNTP) {
-        mutt_flushinp ();
-        mutt_error _("Can't delete attachment from newsserver.");
-
-        break;
-      }
-#endif
-
       if (hdr->security & (~PGP_TRADITIONAL_CHECKED)) {
         mutt_message
           _("Deletion of attachments from encrypted messages is unsupported.");
@@ -1058,32 +1046,6 @@ void mutt_view_attachments (HEADER * hdr)
       menu->redraw = REDRAW_FULL;
       break;
 
-#ifdef USE_NNTP
-    case OP_FORWARD_TO_GROUP:
-      CHECK_ATTACH;
-      mutt_attach_forward (fp, hdr, idx, idxlen,
-                           menu->tagprefix ? NULL : idx[menu->current]->
-                           content, SENDNEWS);
-      menu->redraw = REDRAW_FULL;
-      break;
-
-    case OP_FOLLOWUP:
-      CHECK_ATTACH;
-
-      if (!idx[menu->current]->content->hdr->env->followup_to ||
-          m_strcasecmp(idx[menu->current]->content->hdr->env->followup_to,
-                           "poster")
-          || query_quadoption (OPT_FOLLOWUPTOPOSTER,
-                               _("Reply by mail as poster prefers?")) !=
-          M_YES) {
-        mutt_attach_reply (fp, hdr, idx, idxlen,
-                           menu->tagprefix ? NULL : idx[menu->current]->
-                           content, SENDNEWS | SENDREPLY);
-        menu->redraw = REDRAW_FULL;
-        break;
-      }
-#endif
-
     case OP_REPLY:
     case OP_GROUP_REPLY:
     case OP_LIST_REPLY: