http://www.spinnaker.de/mutt/compressed/
* Patch last synced with upstream:
- - Date: 2005-04-03
- - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.9.rr.compressed.1.gz
+ - Date: 2005-08-14
+ - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz
* Changes made:
- filterdiff -p1 \
$(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \
doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
- - 2005-03-10: fix configure.in to match latest CVS.
== END PATCH
-diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c
---- mutt-1.5.9/compress.c 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.9-ro/compress.c 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c
+--- mutt-1.5.10/compress.c 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.10-ro/compress.c 2005-08-14 12:10:21.000000000 +0200
@@ -0,0 +1,487 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+}
+
+#endif /* USE_COMPRESSED */
-diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h
---- mutt-1.5.9/compress.h 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.9-ro/compress.h 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h
+--- mutt-1.5.10/compress.h 1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.10-ro/compress.h 2005-08-14 12:10:21.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.9/config.h.in mutt-1.5.9-ro/config.h.in
-diff -urN mutt-1.5.9/configure mutt-1.5.9-ro/configure
-diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in
---- mutt-1.5.9/configure.in 2005-03-13 17:36:01.000000000 +0100
-+++ mutt-1.5.9-ro/configure.in 2005-03-20 14:11:05.000000000 +0100
-@@ -777,6 +777,11 @@
+diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in
+diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure
+diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in
+--- mutt-1.5.10/configure.in 2005-08-11 23:49:24.000000000 +0200
++++ mutt-1.5.10-ro/configure.in 2005-08-14 12:10:21.000000000 +0200
+@@ -753,6 +753,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.9/curs_main.c mutt-1.5.9-ro/curs_main.c
---- mutt-1.5.9/curs_main.c 2005-02-28 19:36:35.000000000 +0100
-+++ mutt-1.5.9-ro/curs_main.c 2005-03-20 14:06:20.000000000 +0100
-@@ -1076,6 +1076,11 @@
+diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c
+--- mutt-1.5.10/curs_main.c 2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/curs_main.c 2005-08-14 12:10:21.000000000 +0200
+@@ -1087,6 +1087,11 @@
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-diff -urN mutt-1.5.9/doc/manual-4.html mutt-1.5.9-ro/doc/manual-4.html
-diff -urN mutt-1.5.9/doc/manual-6.html mutt-1.5.9-ro/doc/manual-6.html
-diff -urN mutt-1.5.9/doc/manual.html mutt-1.5.9-ro/doc/manual.html
-diff -urN mutt-1.5.9/doc/manual.sgml mutt-1.5.9-ro/doc/manual.sgml
-diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head
---- mutt-1.5.9/doc/manual.sgml.head 2005-02-19 14:49:49.000000000 +0100
-+++ mutt-1.5.9-ro/doc/manual.sgml.head 2005-03-20 14:06:20.000000000 +0100
-@@ -2539,6 +2539,176 @@
+diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html
+diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html
+diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html
+diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml
+diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head
+--- mutt-1.5.10/doc/manual.sgml.head 2005-08-11 21:37:02.000000000 +0200
++++ mutt-1.5.10-ro/doc/manual.sgml.head 2005-08-14 12:10:21.000000000 +0200
+@@ -2576,6 +2576,176 @@
macro pager \cb |urlview\n
</verb></tscreen>
<sect>Mutt's MIME Support
<p>
Quite a bit of effort has been made to make Mutt the premier text-mode
-@@ -3118,6 +3288,8 @@
+@@ -3156,6 +3326,8 @@
<item>
<tt><ref id="alternative_order" name="unalternative_order"></tt> <em/mimetype/ [ <em/mimetype/ ... ]
<item>
<tt><ref id="auto_view" name="auto_view"></tt> <em/mimetype/ [ <em/mimetype/ ... ]
<item>
<tt><ref id="auto_view" name="unauto_view"></tt> <em/mimetype/ [ <em/mimetype/ ... ]
-@@ -3126,6 +3298,8 @@
+@@ -3164,6 +3336,8 @@
<item>
<tt><ref id="charset-hook" name="charset-hook"></tt> <em/alias/ <em/charset/
<item>
<tt><ref id="color" name="color"></tt> <em/object/ <em/foreground/ <em/background/ [ <em/regexp/ ]
<item>
<tt><ref id="color" name="uncolor"></tt> <em/index/ <em/pattern/ [ <em/pattern/ ... ]
-@@ -3172,6 +3346,8 @@
+@@ -3210,6 +3384,8 @@
<item>
<tt><ref id="my_hdr" name="unmy_hdr"></tt> <em/field/ [ <em/field/ ... ]
<item>
<tt><ref id="crypt-hook" name="crypt-hook"></tt> <em/pattern/ <em/key-id/
<item>
<tt><ref id="push" name="push"></tt> <em/string/
-diff -urN mutt-1.5.9/doc/manual.txt mutt-1.5.9-ro/doc/manual.txt
-diff -urN mutt-1.5.9/doc/muttrc.man mutt-1.5.9-ro/doc/muttrc.man
-diff -urN mutt-1.5.9/doc/muttrc.man.head mutt-1.5.9-ro/doc/muttrc.man.head
---- mutt-1.5.9/doc/muttrc.man.head 2005-01-15 10:42:45.000000000 +0100
-+++ mutt-1.5.9-ro/doc/muttrc.man.head 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/doc/manual.txt mutt-1.5.10-ro/doc/manual.txt
+diff -urN mutt-1.5.10/doc/muttrc.man mutt-1.5.10-ro/doc/muttrc.man
+diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head
+--- mutt-1.5.10/doc/muttrc.man.head 2005-01-15 10:42:45.000000000 +0100
++++ mutt-1.5.10-ro/doc/muttrc.man.head 2005-08-14 12:10:21.000000000 +0200
@@ -316,6 +316,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,
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
-diff -urN mutt-1.5.9/hook.c mutt-1.5.9-ro/hook.c
---- mutt-1.5.9/hook.c 2005-02-03 19:47:52.000000000 +0100
-+++ mutt-1.5.9-ro/hook.c 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c
+--- mutt-1.5.10/hook.c 2005-02-03 19:47:52.000000000 +0100
++++ mutt-1.5.10-ro/hook.c 2005-08-14 12:10:21.000000000 +0200
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
&& (!WithCrypto || !(data & M_CRYPTHOOK))
)
-diff -urN mutt-1.5.9/init.h mutt-1.5.9-ro/init.h
---- mutt-1.5.9/init.h 2005-03-01 16:56:02.000000000 +0100
-+++ mutt-1.5.9-ro/init.h 2005-03-20 14:06:20.000000000 +0100
-@@ -2933,6 +2933,11 @@
+diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h
+--- mutt-1.5.10/init.h 2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/init.h 2005-08-14 12:10:21.000000000 +0200
+@@ -2979,6 +2979,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 },
{ "hdr_order", parse_list, UL &HeaderOrderList },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, M_ICONVHOOK },
-diff -urN mutt-1.5.9/main.c mutt-1.5.9-ro/main.c
---- mutt-1.5.9/main.c 2005-02-12 22:09:52.000000000 +0100
-+++ mutt-1.5.9-ro/main.c 2005-03-20 14:06:20.000000000 +0100
-@@ -376,6 +376,12 @@
+diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c
+--- mutt-1.5.10/main.c 2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/main.c 2005-08-14 12:10:21.000000000 +0200
+@@ -382,6 +382,12 @@
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
-diff -urN mutt-1.5.9/Makefile.am mutt-1.5.9-ro/Makefile.am
---- mutt-1.5.9/Makefile.am 2005-02-13 10:56:41.000000000 +0100
-+++ mutt-1.5.9-ro/Makefile.am 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am
+--- mutt-1.5.10/Makefile.am 2005-08-11 23:27:28.000000000 +0200
++++ mutt-1.5.10-ro/Makefile.am 2005-08-14 12:10:21.000000000 +0200
@@ -18,7 +18,7 @@
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
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.9/Makefile.in mutt-1.5.9-ro/Makefile.in
-diff -urN mutt-1.5.9/mbox.c mutt-1.5.9-ro/mbox.c
---- mutt-1.5.9/mbox.c 2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.9-ro/mbox.c 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/Makefile.in mutt-1.5.10-ro/Makefile.in
+diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c
+--- mutt-1.5.10/mbox.c 2005-08-02 09:08:00.000000000 +0200
++++ mutt-1.5.10-ro/mbox.c 2005-08-14 12:10:21.000000000 +0200
@@ -28,6 +28,10 @@
#include "sort.h"
#include "copy.h"
#include <sys/stat.h>
#include <dirent.h>
#include <string.h>
-@@ -1020,6 +1024,12 @@
+@@ -1014,6 +1018,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.9/mutt.h mutt-1.5.9-ro/mutt.h
---- mutt-1.5.9/mutt.h 2005-02-28 16:13:57.000000000 +0100
-+++ mutt-1.5.9-ro/mutt.h 2005-03-20 14:06:20.000000000 +0100
-@@ -159,6 +159,11 @@
+diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h
+--- mutt-1.5.10/mutt.h 2005-08-11 21:37:23.000000000 +0200
++++ mutt-1.5.10-ro/mutt.h 2005-08-14 12:10:21.000000000 +0200
+@@ -161,6 +161,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
-@@ -824,6 +829,11 @@
+@@ -829,6 +834,11 @@
void *data; /* driver specific data */
#endif /* USE_IMAP */
short magic; /* mailbox type */
unsigned int locked : 1; /* is the mailbox locked? */
-diff -urN mutt-1.5.9/Muttrc mutt-1.5.9-ro/Muttrc
-diff -urN mutt-1.5.9/Muttrc.head mutt-1.5.9-ro/Muttrc.head
-diff -urN mutt-1.5.9/Muttrc.head.in mutt-1.5.9-ro/Muttrc.head.in
-diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c
---- mutt-1.5.9/mx.c 2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.9-ro/mx.c 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc
+diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head
+diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in
+diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c
+--- mutt-1.5.10/mx.c 2005-08-02 09:08:01.000000000 +0200
++++ mutt-1.5.10-ro/mx.c 2005-08-14 12:10:21.000000000 +0200
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
mx_fastclose_mailbox (ctx);
return 0;
-@@ -1325,6 +1360,11 @@
+@@ -1330,6 +1365,11 @@
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h
---- mutt-1.5.9/mx.h 2003-08-05 15:58:16.000000000 +0200
-+++ mutt-1.5.9-ro/mx.h 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h
+--- mutt-1.5.10/mx.h 2003-08-05 15:58:16.000000000 +0200
++++ mutt-1.5.10-ro/mx.h 2005-08-14 12:10:21.000000000 +0200
@@ -40,6 +40,9 @@
#ifdef USE_POP
, M_POP
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-diff -urN mutt-1.5.9/PATCHES mutt-1.5.9-ro/PATCHES
---- mutt-1.5.9/PATCHES 2005-03-13 17:33:06.000000000 +0100
-+++ mutt-1.5.9-ro/PATCHES 2005-03-20 17:59:28.000000000 +0100
+diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES
+--- mutt-1.5.10/PATCHES 2005-08-11 23:27:30.000000000 +0200
++++ mutt-1.5.10-ro/PATCHES 2005-08-14 12:10:35.000000000 +0200
@@ -0,0 +1 @@
-+patch-1.5.9.rr.compressed.1
-diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po
---- mutt-1.5.9/po/de.po 2005-03-13 17:38:22.000000000 +0100
-+++ mutt-1.5.9-ro/po/de.po 2005-03-20 14:06:20.000000000 +0100
-@@ -715,6 +715,48 @@
- msgid "PGP already selected. Clear & continue ? "
- msgstr "PGP bereits ausgewählt. Löschen und weiter?"
++patch-1.5.10.rr.compressed.1
+diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
+--- mutt-1.5.10/po/de.po 2005-08-11 23:50:35.000000000 +0200
++++ mutt-1.5.10-ro/po/de.po 2005-08-14 12:12:20.000000000 +0200
+@@ -1281,6 +1281,48 @@
+ msgid "Failed to figure out sender"
+ msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
+#: compress.c:203 mbox.c:661
+msgid "Mailbox was corrupted!"
#: crypt.c:69
#, c-format
msgid " (current time: %c)"
-@@ -1305,6 +1347,10 @@
+@@ -1901,6 +1943,10 @@
msgid "Help for %s"
msgstr "Hilfe für %s"
#: hook.c:246
#, c-format
msgid "unhook: Can't do unhook * from within a hook."
-@@ -2737,18 +2783,10 @@
+@@ -3383,18 +3429,10 @@
msgid "Mailbox is corrupt!"
msgstr "Mailbox fehlerhaft!"
-msgid "Mailbox was corrupted!"
-msgstr "Mailbox wurde zerstört!"
-
- #: mbox.c:699 mbox.c:953
+ #: mbox.c:701 mbox.c:952
msgid "Fatal error! Could not reopen mailbox!"
msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
--#: mbox.c:708
+-#: mbox.c:710
-msgid "Unable to lock mailbox!"
-msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
-
#. 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.9/po/POTFILES.in mutt-1.5.9-ro/po/POTFILES.in
---- mutt-1.5.9/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100
-+++ mutt-1.5.9-ro/po/POTFILES.in 2005-03-20 14:06:20.000000000 +0100
+diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in
+--- mutt-1.5.10/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200
++++ mutt-1.5.10-ro/po/POTFILES.in 2005-08-14 12:13:18.000000000 +0200
@@ -8,6 +8,7 @@
color.c
commands.c
compose.c
+compress.c
+ crypt-gpgme.c
crypt.c
- curs_lib.c
- curs_main.c
-diff -urN mutt-1.5.9/status.c mutt-1.5.9-ro/status.c
---- mutt-1.5.9/status.c 2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.9-ro/status.c 2005-03-20 14:06:20.000000000 +0100
+ cryptglue.c
+diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c
+--- mutt-1.5.10/status.c 2005-02-03 19:47:53.000000000 +0100
++++ mutt-1.5.10-ro/status.c 2005-08-14 12:10:21.000000000 +0200
@@ -97,6 +97,14 @@
case 'f':
projects / software / mutt-debian.git / blobdiff