X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=622650a8451617af89617ecc8f5f535ca42d12df;hp=34de35e590817169d966a18a2794debe64ab7135;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=22601f25ede6703ba7cd06ee84eddd2045308570

diff --git a/commands.c b/commands.c
index 34de35e..622650a 100644
--- a/commands.c
+++ b/commands.c
@@ -12,18 +12,32 @@
 # include "config.h"
 #endif
 
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <utime.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-sys/exit.h>
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "enter.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
 #include "sort.h"
 #include "copy.h"
 #include "mx.h"
@@ -41,17 +55,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/debug.h"
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <utime.h>
-
 /* The folder the user last saved to.  Used by ci_save_message() */
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -891,14 +894,14 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   b->force_charset |= charset_changed ? 1 : 0;
 
-  if (!is_multipart (b) && b->parts)
+  if (!is_multipart(b) && b->parts)
     mutt_free_body (&b->parts);
   if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
     b->hdr->content = NULL;
     header_delete(&b->hdr);
   }
 
-  if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype)))
+  if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype)))
     mutt_parse_part (fp, b);
 
   if (h) {