X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=c06f2fd5d88254e7ecdcbab80c93b96e10d61e4d;hp=f6039fbc24395d6077741e9c6800f453592bc47d;hb=74697a5c38af6a85ce3b0062d781c35814a9f536;hpb=a742b680bdba8cb47d2b81ab3397cdbec7ed5b69

diff --git a/compose.c b/compose.c
index f6039fb..c06f2fd 100644
--- a/compose.c
+++ b/compose.c
@@ -11,22 +11,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
 
@@ -45,7 +30,6 @@
 #include "charset.h"
 #include "mx.h"
 #include "buffy.h"
-#include "compose.h"
 
 #ifdef MIXMASTER
 #include "remailer.h"
@@ -442,6 +426,9 @@ static unsigned long cum_attachs_size (MUTTMENU * menu)
  * help when modifying this function.
  */
 
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
+                                 const char *p);
+
 static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *src, const char *prefix,
                                        const char *ifstring,