X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=editmsg.c;h=6d848e321f7c71e49eab4b459e8231df38c1700e;hp=3e2bd0f72812ecd9044b8cd58150253ebd3f4f4f;hb=0a19973a356fb85d0b1e2a2f02820a3e5071f402;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/editmsg.c b/editmsg.c
index 3e2bd0f..6d848e3 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -9,22 +9,12 @@
 
 /* simple, editor-based message editing */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.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 "lib/str.h"
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <time.h>
 
 /*
  * return value:
@@ -54,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);
 
@@ -175,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);