-diff -urN mutt-1.5.12/compress.c mutt-1.5.12-ro/compress.c
---- mutt-1.5.12/compress.c 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.12-ro/compress.c 2006-07-15 20:13:19.000000000 +0200
-@@ -0,0 +1,487 @@
+diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c
+--- mutt-1.5.15/compress.c 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.15-ro/compress.c 2007-05-27 14:20:23.000000000 +0200
+@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+ *
+ int magic;
+
+ if (is_new (path))
-+ return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
++ {
++ char *dir_path = safe_strdup(path);
++ char *aux = strrchr(dir_path, '/');
++ int dir_valid = 1;
++ if (aux)
++ {
++ *aux='\0';
++ if (access(dir_path, W_OK|X_OK))
++ dir_valid = 0;
++ }
++ safe_free((void**)&dir_path);
++ return dir_valid && (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
++ }
+
+ magic = mx_get_magic (path);
+
+ COMPRESS_INFO *ci = set_compress_info (ctx);
+ if (!ci->open) {
+ ctx->magic = 0;
-+ FREE (ctx->compressinfo);
++ FREE (&ctx->compressinfo);
+ return (-1);
+ }
+ if (!ci->close || access (ctx->path, W_OK) != 0)
+ {
+ mutt_any_key_to_continue (NULL);
+ ctx->magic = 0;
-+ FREE (ctx->compressinfo);
++ FREE (&ctx->compressinfo);
+ mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd);
+ }
+ FREE (&cmd);
+}
+
+#endif /* USE_COMPRESSED */
-diff -urN mutt-1.5.12/compress.h mutt-1.5.12-ro/compress.h
---- mutt-1.5.12/compress.h 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.12-ro/compress.h 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/compress.h mutt-1.5.15-ro/compress.h
+--- mutt-1.5.15/compress.h 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.15-ro/compress.h 2007-05-27 14:20:23.000000000 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+int mutt_test_compress_command (const char *);
+int mutt_check_mailbox_compressed (CONTEXT *);
+void mutt_fast_close_compressed (CONTEXT *);
-diff -urN mutt-1.5.12/config.h.in mutt-1.5.12-ro/config.h.in
---- mutt-1.5.12/config.h.in 2006-07-14 20:15:56.000000000 +0200
-+++ mutt-1.5.12-ro/config.h.in 2006-07-15 20:13:19.000000000 +0200
-@@ -510,6 +510,9 @@
+diff -urN mutt-1.5.15/config.h.in mutt-1.5.15-ro/config.h.in
+--- mutt-1.5.15/config.h.in 2007-04-06 09:18:47.000000000 +0200
++++ mutt-1.5.15-ro/config.h.in 2007-05-27 14:20:23.000000000 +0200
+@@ -513,6 +513,9 @@
/* Define to enable Sun mailtool attachments support. */
#undef SUN_ATTACHMENT
/* Define to use dotlocking for mailboxes. */
#undef USE_DOTLOCK
-diff -urN mutt-1.5.12/configure mutt-1.5.12-ro/configure
---- mutt-1.5.12/configure 2006-07-14 20:15:42.000000000 +0200
-+++ mutt-1.5.12-ro/configure 2006-07-15 20:13:19.000000000 +0200
-@@ -872,6 +872,7 @@
+diff -urN mutt-1.5.15/configure mutt-1.5.15-ro/configure
+--- mutt-1.5.15/configure 2007-04-06 09:17:16.000000000 +0200
++++ mutt-1.5.15-ro/configure 2007-05-27 14:20:23.000000000 +0200
+@@ -1354,6 +1354,7 @@
--enable-hcache Enable header caching
--disable-iconv Disable iconv support
--disable-nls Do not use Native Language Support
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -17290,6 +17291,17 @@
+@@ -17502,6 +17503,17 @@
fi
+# Check whether --enable-compressed or --disable-compressed was given.
+if test "${enable_compressed+set}" = set; then
-+ enableval="$enable_compressed"
-+ if test x$enableval = xyes; then
-+ cat >> confdefs.h <<\EOF
++ enableval="$enable_compressed"; if test x$enableval = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
+#define USE_COMPRESSED 1
-+EOF
++_ACEOF
+
+ fi
+fi
# Check whether --with-exec-shell was given.
if test "${with_exec_shell+set}" = set; then
-diff -urN mutt-1.5.12/configure.in mutt-1.5.12-ro/configure.in
---- mutt-1.5.12/configure.in 2006-07-14 20:15:32.000000000 +0200
-+++ mutt-1.5.12-ro/configure.in 2006-07-15 20:13:19.000000000 +0200
-@@ -745,6 +745,11 @@
+diff -urN mutt-1.5.15/configure.ac mutt-1.5.15-ro/configure.ac
+--- mutt-1.5.15/configure.ac 2007-04-06 09:11:53.000000000 +0200
++++ mutt-1.5.15-ro/configure.ac 2007-05-27 14:33:52.000000000 +0200
+@@ -803,6 +803,11 @@
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
[if test $withval != yes; then
AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-diff -urN mutt-1.5.12/curs_main.c mutt-1.5.12-ro/curs_main.c
---- mutt-1.5.12/curs_main.c 2006-06-08 13:50:29.000000000 +0200
-+++ mutt-1.5.12-ro/curs_main.c 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/curs_main.c mutt-1.5.15-ro/curs_main.c
+--- mutt-1.5.15/curs_main.c 2007-04-03 19:41:14.000000000 +0200
++++ mutt-1.5.15-ro/curs_main.c 2007-05-27 14:20:26.000000000 +0200
@@ -1096,6 +1096,11 @@
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-diff -urN mutt-1.5.12/doc/manual.xml.head mutt-1.5.12-ro/doc/manual.xml.head
---- mutt-1.5.12/doc/manual.xml.head 2006-07-14 20:09:13.000000000 +0200
-+++ mutt-1.5.12-ro/doc/manual.xml.head 2006-07-15 20:20:18.000000000 +0200
-@@ -4747,6 +4747,205 @@
+diff -urN mutt-1.5.15/doc/manual.xml.head mutt-1.5.15-ro/doc/manual.xml.head
+--- mutt-1.5.15/doc/manual.xml.head 2007-04-04 07:37:13.000000000 +0200
++++ mutt-1.5.15-ro/doc/manual.xml.head 2007-05-27 14:20:26.000000000 +0200
+@@ -4910,6 +4910,205 @@
</chapter>
<chapter id="mimesupport">
<title>Mutt's MIME Support</title>
-diff -urN mutt-1.5.12/doc/muttrc.man.head mutt-1.5.12-ro/doc/muttrc.man.head
---- mutt-1.5.12/doc/muttrc.man.head 2006-07-11 17:01:04.000000000 +0200
-+++ mutt-1.5.12-ro/doc/muttrc.man.head 2006-07-15 20:13:19.000000000 +0200
-@@ -316,6 +316,24 @@
+diff -urN mutt-1.5.15/doc/muttrc.man.head mutt-1.5.15-ro/doc/muttrc.man.head
+--- mutt-1.5.15/doc/muttrc.man.head 2007-04-01 23:58:55.000000000 +0200
++++ mutt-1.5.15-ro/doc/muttrc.man.head 2007-05-27 14:20:26.000000000 +0200
+@@ -345,6 +345,24 @@
to a certain recipient. The meaning of "key ID" is to be taken
broadly: This can be a different e-mail address, a numerical key ID,
or even just an arbitrary search string.
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
-diff -urN mutt-1.5.12/hook.c mutt-1.5.12-ro/hook.c
---- mutt-1.5.12/hook.c 2006-03-03 11:11:43.000000000 +0100
-+++ mutt-1.5.12-ro/hook.c 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/hook.c mutt-1.5.15-ro/hook.c
+--- mutt-1.5.15/hook.c 2007-04-01 23:58:56.000000000 +0200
++++ mutt-1.5.15-ro/hook.c 2007-05-27 14:23:46.000000000 +0200
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
+ }
+ }
+#endif
- else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
+ else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
&& (!WithCrypto || !(data & M_CRYPTHOOK))
)
-diff -urN mutt-1.5.12/init.h mutt-1.5.12-ro/init.h
---- mutt-1.5.12/init.h 2006-07-05 10:40:05.000000000 +0200
-+++ mutt-1.5.12-ro/init.h 2006-07-15 20:14:00.000000000 +0200
-@@ -3052,6 +3052,11 @@
+diff -urN mutt-1.5.15/init.h mutt-1.5.15-ro/init.h
+--- mutt-1.5.15/init.h 2007-04-05 18:03:55.000000000 +0200
++++ mutt-1.5.15-ro/init.h 2007-05-27 14:20:26.000000000 +0200
+@@ -3111,6 +3111,11 @@
{ "fcc-hook", mutt_parse_hook, M_FCCHOOK },
{ "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK },
{ "folder-hook", mutt_parse_hook, M_FOLDERHOOK },
{ "group", parse_group, 0 },
{ "ungroup", parse_ungroup, 0 },
{ "hdr_order", parse_list, UL &HeaderOrderList },
-diff -urN mutt-1.5.12/main.c mutt-1.5.12-ro/main.c
---- mutt-1.5.12/main.c 2006-07-12 01:38:47.000000000 +0200
-+++ mutt-1.5.12-ro/main.c 2006-07-15 20:13:19.000000000 +0200
-@@ -398,6 +398,12 @@
+diff -urN mutt-1.5.15/main.c mutt-1.5.15-ro/main.c
+--- mutt-1.5.15/main.c 2007-04-04 07:37:13.000000000 +0200
++++ mutt-1.5.15-ro/main.c 2007-05-27 14:20:26.000000000 +0200
+@@ -401,6 +401,12 @@
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
---- mutt-1.5.13/Makefile.am.orig 2006-08-14 15:47:23.000000000 +0200
-+++ mutt-1.5.13/Makefile.am 2006-08-23 22:28:08.238682000 +0200
+diff -urN mutt-1.5.15/Makefile.am mutt-1.5.15-ro/Makefile.am
+--- mutt-1.5.15/Makefile.am 2007-04-06 22:04:45.000000000 +0200
++++ mutt-1.5.15-ro/Makefile.am 2007-05-27 14:20:26.000000000 +0200
@@ -18,7 +18,7 @@
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
@@ -66,7 +66,7 @@
- crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c
+ utf8.c wcwidth.c
EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
- configure account.h \
attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
-diff -urN mutt-1.5.12/mbox.c mutt-1.5.12-ro/mbox.c
---- mutt-1.5.12/mbox.c 2005-10-31 11:02:08.000000000 +0100
-+++ mutt-1.5.12-ro/mbox.c 2006-07-15 20:13:19.000000000 +0200
-@@ -28,6 +28,10 @@
- #include "sort.h"
+diff -urN mutt-1.5.15/Makefile.in mutt-1.5.15-ro/Makefile.in
+--- mutt-1.5.15/Makefile.in 2007-04-06 22:05:40.000000000 +0200
++++ mutt-1.5.15-ro/Makefile.in 2007-05-27 14:20:26.000000000 +0200
+@@ -74,7 +74,7 @@
+ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
+ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
+ cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \
+- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
++ compose.$(OBJEXT) compress.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
+ curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \
+ enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \
+ filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \
+@@ -301,7 +301,7 @@
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
+ mutt_SOURCES = $(BUILT_SOURCES) \
+ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
+- crypt.c cryptglue.c \
++ crypt.c cryptglue.c compress.c \
+ commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
+ edit.c enter.c flags.c init.c filter.c from.c \
+ getdomain.c group.c \
+@@ -334,7 +334,7 @@
+ utf8.c wcwidth.c
+
+ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
+- configure account.h \
++ configure account.h compress.h \
+ attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
+ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
+ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
+@@ -504,6 +504,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@
+diff -urN mutt-1.5.15/mbox.c mutt-1.5.15-ro/mbox.c
+--- mutt-1.5.15/mbox.c 2007-04-01 23:58:56.000000000 +0200
++++ mutt-1.5.15-ro/mbox.c 2007-05-27 14:20:26.000000000 +0200
+@@ -29,6 +29,10 @@
#include "copy.h"
+ #include "mutt_curses.h"
+#ifdef USE_COMPRESSED
+#include "compress.h"
#include <sys/stat.h>
#include <dirent.h>
#include <string.h>
-@@ -1014,6 +1018,12 @@
+@@ -1026,6 +1030,12 @@
int mbox_close_mailbox (CONTEXT *ctx)
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
return 0;
-diff -urN mutt-1.5.12/mutt.h mutt-1.5.12-ro/mutt.h
---- mutt-1.5.12/mutt.h 2006-06-08 13:49:07.000000000 +0200
-+++ mutt-1.5.12-ro/mutt.h 2006-07-15 20:13:19.000000000 +0200
-@@ -157,6 +157,11 @@
+diff -urN mutt-1.5.15/mutt.h mutt-1.5.15-ro/mutt.h
+--- mutt-1.5.15/mutt.h 2007-04-02 20:04:35.000000000 +0200
++++ mutt-1.5.15-ro/mutt.h 2007-05-27 14:20:26.000000000 +0200
+@@ -160,6 +160,11 @@
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
#define M_SEND2HOOK (1<<11)
/* tree characters for linearize_tree and print_enriched_string */
#define M_TREE_LLCORNER 1
-@@ -860,6 +865,11 @@
- void *data; /* driver specific data */
- #endif /* USE_IMAP */
+@@ -882,6 +887,11 @@
+ int flagged; /* how many flagged messages */
+ int msgnotreadyet; /* which msg "new" in pager, -1 if none */
+#ifdef USE_COMPRESSED
+ void *compressinfo; /* compressed mbox module private data */
+
short magic; /* mailbox type */
- unsigned int locked : 1; /* is the mailbox locked? */
-diff -urN mutt-1.5.12/Muttrc mutt-1.5.12-ro/Muttrc
---- mutt-1.5.12/Muttrc 2006-07-14 20:15:57.000000000 +0200
-+++ mutt-1.5.12-ro/Muttrc 2006-07-15 20:13:19.000000000 +0200
-@@ -20,6 +20,11 @@
- macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
- bind browser y exit
-
-+# Use folders which match on \\.gz$ as gzipped folders:
-+# open-hook \\.gz$ "gzip -cd %f > %t"
-+# close-hook \\.gz$ "gzip -c %t > %f"
-+# append-hook \\.gz$ "gzip -c %t >> %f"
-+
- # If Mutt is unable to determine your site's domain name correctly, you can
- # set the default here.
- #
-diff -urN mutt-1.5.12/Muttrc.head mutt-1.5.12-ro/Muttrc.head
---- mutt-1.5.12/Muttrc.head 2006-07-14 20:15:55.000000000 +0200
-+++ mutt-1.5.12-ro/Muttrc.head 2006-07-15 20:13:19.000000000 +0200
-@@ -20,6 +20,11 @@
+ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
+diff -urN mutt-1.5.15/Muttrc mutt-1.5.15-ro/Muttrc
+--- mutt-1.5.15/Muttrc 2007-04-06 22:34:36.000000000 +0200
++++ mutt-1.5.15-ro/Muttrc 2007-05-27 14:20:26.000000000 +0200
+@@ -21,6 +21,11 @@
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
bind browser y exit
# If Mutt is unable to determine your site's domain name correctly, you can
# set the default here.
#
-diff -urN mutt-1.5.12/Muttrc.head.in mutt-1.5.12-ro/Muttrc.head.in
---- mutt-1.5.12/Muttrc.head.in 2005-10-04 17:05:34.000000000 +0200
-+++ mutt-1.5.12-ro/Muttrc.head.in 2006-07-15 20:13:19.000000000 +0200
-@@ -20,6 +20,11 @@
+diff -urN mutt-1.5.15/Muttrc.head mutt-1.5.15-ro/Muttrc.head
+--- mutt-1.5.15/Muttrc.head 2007-04-01 23:58:55.000000000 +0200
++++ mutt-1.5.15-ro/Muttrc.head 2007-05-27 14:20:26.000000000 +0200
+@@ -21,6 +21,11 @@
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
bind browser y exit
# If Mutt is unable to determine your site's domain name correctly, you can
# set the default here.
#
-diff -urN mutt-1.5.12/mx.c mutt-1.5.12-ro/mx.c
---- mutt-1.5.12/mx.c 2006-05-18 20:44:29.000000000 +0200
-+++ mutt-1.5.12-ro/mx.c 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c
+--- mutt-1.5.15/mx.c 2007-04-03 19:41:14.000000000 +0200
++++ mutt-1.5.15-ro/mx.c 2007-05-27 14:24:41.000000000 +0200
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
#endif
-@@ -454,6 +458,10 @@
+@@ -450,6 +454,10 @@
return (-1);
}
return (magic);
}
-@@ -493,6 +501,13 @@
+@@ -489,6 +497,13 @@
{
struct stat sb;
ctx->append = 1;
#ifdef USE_IMAP
-@@ -653,7 +668,12 @@
+@@ -652,7 +667,12 @@
}
ctx->magic = mx_get_magic (path);
if(ctx->magic == 0)
mutt_error (_("%s is not a mailbox."), path);
-@@ -759,6 +779,10 @@
+@@ -753,6 +773,10 @@
mutt_free_header (&ctx->hdrs[i]);
FREE (&ctx->hdrs);
FREE (&ctx->v2r);
FREE (&ctx->path);
FREE (&ctx->pattern);
if (ctx->limit_pattern)
-@@ -816,6 +840,12 @@
+@@ -805,6 +829,12 @@
+
if (tmp && tmp->new == 0)
mutt_update_mailbox (tmp);
- #endif
+
+#ifdef USE_COMPRESSED
+ if (rc == 0 && ctx->compressinfo)
return rc;
}
-@@ -1017,6 +1047,11 @@
+@@ -1006,6 +1036,11 @@
!mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
mx_unlink_empty (ctx->path);
mx_fastclose_mailbox (ctx);
return 0;
-@@ -1326,6 +1361,11 @@
+@@ -1315,6 +1350,11 @@
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-diff -urN mutt-1.5.12/mx.h mutt-1.5.12-ro/mx.h
---- mutt-1.5.12/mx.h 2005-09-18 10:22:22.000000000 +0200
-+++ mutt-1.5.12-ro/mx.h 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/mx.h mutt-1.5.15-ro/mx.h
+--- mutt-1.5.15/mx.h 2007-04-01 23:58:56.000000000 +0200
++++ mutt-1.5.15-ro/mx.h 2007-05-27 14:20:29.000000000 +0200
@@ -40,6 +40,9 @@
#ifdef USE_POP
, M_POP
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-diff -urN mutt-1.5.12/PATCHES mutt-1.5.12-ro/PATCHES
---- mutt-1.5.12/PATCHES 2006-07-14 20:12:47.000000000 +0200
-+++ mutt-1.5.12-ro/PATCHES 2006-07-15 20:21:02.000000000 +0200
+diff -urN mutt-1.5.15/PATCHES mutt-1.5.15-ro/PATCHES
+--- mutt-1.5.15/PATCHES 2007-03-15 16:49:37.000000000 +0100
++++ mutt-1.5.15-ro/PATCHES 2007-05-27 14:38:02.000000000 +0200
@@ -0,0 +1 @@
-+patch-1.5.12.rr.compressed.1
-diff -urN mutt-1.5.12/po/de.po mutt-1.5.12-ro/po/de.po
---- mutt-1.5.12/po/de.po 2006-07-14 20:16:36.000000000 +0200
-+++ mutt-1.5.12-ro/po/de.po 2006-07-15 20:13:19.000000000 +0200
-@@ -1262,6 +1262,48 @@
++patch-1.5.15.rr.compressed.2
+diff -urN mutt-1.5.15/po/de.po mutt-1.5.15-ro/po/de.po
+--- mutt-1.5.15/po/de.po 2007-04-06 22:35:40.000000000 +0200
++++ mutt-1.5.15-ro/po/de.po 2007-05-27 14:22:49.000000000 +0200
+@@ -1280,6 +1280,48 @@
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#: crypt.c:69
#, c-format
msgid " (current time: %c)"
-@@ -1910,6 +1952,10 @@
- msgid "Help for %s"
- msgstr "Hilfe für %s"
+@@ -1945,6 +1987,10 @@
+ msgid "Bad history file format (line %d)"
+ msgstr ""
+#: hook.c:96
+msgid "bad formatted command string"
+msgstr "Hook enthält nicht die Muster %f und %t"
+
- #: hook.c:246
+ #: hook.c:251
#, c-format
msgid "unhook: Can't do unhook * from within a hook."
-@@ -3424,18 +3470,10 @@
+@@ -3437,18 +3483,10 @@
msgid "Mailbox is corrupt!"
msgstr "Mailbox fehlerhaft!"
#. this means ctx->changed or ctx->deleted was set, but no
#. * messages were found to be changed or deleted. This should
#. * never happen, is we presume it is a bug in mutt.
-diff -urN mutt-1.5.12/po/POTFILES.in mutt-1.5.12-ro/po/POTFILES.in
---- mutt-1.5.12/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200
-+++ mutt-1.5.12-ro/po/POTFILES.in 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/po/POTFILES.in mutt-1.5.15-ro/po/POTFILES.in
+--- mutt-1.5.15/po/POTFILES.in 2007-04-01 23:58:57.000000000 +0200
++++ mutt-1.5.15-ro/po/POTFILES.in 2007-05-27 14:20:29.000000000 +0200
@@ -8,6 +8,7 @@
color.c
commands.c
crypt-gpgme.c
crypt.c
cryptglue.c
-diff -urN mutt-1.5.12/status.c mutt-1.5.12-ro/status.c
---- mutt-1.5.12/status.c 2005-09-18 10:22:22.000000000 +0200
-+++ mutt-1.5.12-ro/status.c 2006-07-15 20:13:19.000000000 +0200
+diff -urN mutt-1.5.15/status.c mutt-1.5.15-ro/status.c
+--- mutt-1.5.15/status.c 2007-04-01 23:58:58.000000000 +0200
++++ mutt-1.5.15-ro/status.c 2007-05-27 14:20:29.000000000 +0200
@@ -97,6 +97,14 @@
case 'f':