X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=editmsg.c;h=c66f5eea6c3568d620a78c93a591a04b34c89289;hp=cb6616f4c8d32f99664a155877e7a22ed62d14d1;hb=0e61856236c91a428ad77f6e2a61b744cf4973e1;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/editmsg.c b/editmsg.c
index cb6616f..c66f5ee 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -9,23 +9,12 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
+#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:
@@ -55,7 +44,7 @@ static int edit_one_message (CONTEXT * ctx, HEADER * cur)
 
   struct stat sb;
   time_t mtime = 0;
-  size_t size = 0;
+  ssize_t size = 0;
 
   mutt_mktemp (tmp);
 
@@ -103,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));
@@ -176,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);