X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=a604ca09df4117263c6734eeeb2aafc29da7d4d3;hp=96d0bb1d14106841f74adb5ee77c682139c1e169;hb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/compose.c b/compose.c
index 96d0bb1..a604ca0 100644
--- a/compose.c
+++ b/compose.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 static const char *There_are_no_attachments = N_("There are no attachments.");
@@ -1069,14 +1069,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       idx[menu->current]->content->unlink =
         !idx[menu->current]->content->unlink;
 
-#if 0
-      /* OPTRESOLVE is otherwise ignored on this menu.
-       * Where's the bug?
-       */
-
-      if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
-        menu->current++;
-# endif
       menu->redraw = REDRAW_INDEX;
       /* No send2hook since this doesn't change the message. */
       break;
@@ -1165,7 +1157,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           p_delete(&idx[idxlen]);
           continue;
         }
-        fclose (fp);
+        m_fclose(&fp);
 
         if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
           mutt_error