X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=86004f293a0035397eddbf73715f0cb1e1fdc174;hp=7ea19521343e17d5a73fb76ea24a2a983056c55b;hb=fa7f733a61a6fe3143198791ab470ddf4d08fdbe;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/compose.c b/compose.c
index 7ea1952..86004f2 100644
--- a/compose.c
+++ b/compose.c
@@ -1,20 +1,14 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * Parts were written/modified by:
+ * Nico Golde <nico@ngolde.de>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -33,6 +27,7 @@
 #include "sort.h"
 #include "charset.h"
 #include "mx.h"
+#include "compose.h"
 
 #ifdef MIXMASTER
 #include "remailer.h"
@@ -42,6 +37,10 @@
 #include "nntp.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -437,10 +436,6 @@ static unsigned long cum_attachs_size (MUTTMENU * menu)
   return s;
 }
 
-/* prototype for use below */
-static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu,
-                                 const char *p);
-
 /*
  * compose_format_str()
  *