simplify alias expansion a lot.

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 58eaaa5..622650a 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -12,48 +12,49 @@
 # 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"
 #include "pager.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 #include "rfc1524.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
+#include <imap/imap.h>
 
 #ifdef BUFFY_SIZE
 #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] = "";
 
@@ -754,7 +755,6 @@ int mutt_save_message (HEADER * h, int delete,
 
   mutt_message (_("Copying to %s..."), buf);
 
-#ifdef USE_IMAP
   if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
     switch (imap_copy_messages (Context, h, buf, delete)) {
       /* success */
@@ -769,7 +769,6 @@ int mutt_save_message (HEADER * h, int delete,
       return -1;
     }
   }
-#endif
 
   if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) {
     if (h) {
@@ -858,7 +857,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     return;
 
   /* clean up previous junk */
-  mutt_free_parameter (&b->parameter);
+  parameter_delete(&b->parameter);
   p_delete(&b->subtype);
 
   mutt_parse_content_type (buf, b);
@@ -895,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;
-    mutt_free_header (&b->hdr);
+    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) {