more simplifications. also fix gpgme crypt menu

[apps/madmutt.git] / editmsg.c

diff --git a/editmsg.c b/editmsg.c
index 123ce7e..c66f5ee 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -9,21 +9,12 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "copy.h"
-#include "mx.h"
-
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
 
 /*
  * return value:
@@ -101,7 +92,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
     goto bail;
   }
 
-  mutt_edit_file (NONULL (Editor), tmp);
+  mutt_edit_file(tmp);
 
   if ((rc = stat (tmp, &sb)) == -1) {
     mutt_error (_("Can't stat %s: %s"), tmp, strerror (errno));
@@ -174,8 +165,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
   mx_close_mailbox (&tmpctx, NULL);
 
 bail:
-  if (fp)
-    fclose (fp);
+  m_fclose(&fp);
 
   if (rc >= 0)
     unlink (tmp);