* New snapshot.
+ Removed hardcoded pager progress indicator and add %P format code to
$pager_status which contains the same information.
Mutt: #2087, Closes: #259145.
* $smime_verify_opaque_command: fallback to -noverify.
Mutt: #2428, Closes: #420014.
+mutt (1.5.15+20070515-1) experimental; urgency=low
+
+ * New snapshot.
+ + Removed hardcoded pager progress indicator and add %P format code to
+ $pager_status which contains the same information.
+ Mutt: #2087, Closes: #259145.
+ * $smime_verify_opaque_command: fallback to -noverify.
+ Mutt: #2428, Closes: #420014.
+
+ -- Christoph Berg <myon@debian.org> Thu, 17 May 2007 14:15:48 +0200
+
mutt (1.5.15+20070412-1) experimental; urgency=low
* New snapshot:
mutt (1.5.15+20070412-1) experimental; urgency=low
* New snapshot:
#set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER"
set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c"
set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f"
#set smime_sign_command="openssl smime -sign -signer %c -inkey %k -passin stdin -in %f -outform DER"
set smime_decrypt_command="openssl smime -decrypt -passin stdin -inform DER -in %f -inkey %k -recip %c"
set smime_verify_command="openssl smime -verify -inform DER -in %s %C -content %f"
-set smime_verify_opaque_command="openssl smime -verify -inform DER -in %s %C"
+set smime_verify_opaque_command="\
+openssl smime -verify -inform DER -in %s %C || \
+openssl smime -verify -inform DER -in %s -noverify 2>/dev/null"
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -111,13 +111,13 @@
+Index: doc/Makefile.in
+===================================================================
+--- doc/Makefile.in.orig 2007-05-17 14:47:01.000000000 +0200
++++ doc/Makefile.in 2007-05-17 14:58:34.000000000 +0200
+@@ -435,15 +435,16 @@ uninstall-local:
check:
manual.txt: manual.html
check:
manual.txt: manual.html
-- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+ /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@
+- -lynx -dump -nolist -with_backspaces $^ > $@ || \
++ /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@ || \
++ lynx -dump -nolist -with_backspaces $^ > $@ || \
+ w3m -dump $^ > $@ || \
+ elinks -dump -no-numbering -no-references $^ > $@
manual.html: $(srcdir)/html.xsl stamp-doc-xml
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
manual.html: $(srcdir)/html.xsl stamp-doc-xml
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
touch stamp-doc-chunked
+ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
touch stamp-doc-chunked
+ $(HTML_DOCFILES): stamp-doc-chunked
doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
- 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
- 2007-03-20 myon: conflict in mx.c resolved (BUFFY_SIZE is gone)
doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
- 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
- 2007-03-20 myon: conflict in mx.c resolved (BUFFY_SIZE is gone)
+ - 2007-05-16 myon: conflict in flags.c resolved, adjusted mutt_FormatString
+ call and compresshook_format_str in compress.c
== END PATCH
Index: debian-mutt/compress.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
== END PATCH
Index: debian-mutt/compress.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.c 2007-04-12 18:56:02.000000000 +0200
++++ debian-mutt/compress.c 2007-05-17 00:11:39.000000000 +0200
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+}
+
+static const char *
+}
+
+static const char *
-+compresshook_format_str (char *dest, size_t destlen, char op, const char *src,
++compresshook_format_str (char *dest, size_t destlen, size_t col, char op, const char *src,
+ const char *fmt, const char *ifstring,
+ const char *elsestring, unsigned long data,
+ format_flag flags)
+ const char *fmt, const char *ifstring,
+ const char *elsestring, unsigned long data,
+ format_flag flags)
+static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx)
+{
+ char expanded[_POSIX_PATH_MAX];
+static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx)
+{
+ char expanded[_POSIX_PATH_MAX];
-+ mutt_FormatString (expanded, sizeof (expanded), cmd, compresshook_format_str,
++ mutt_FormatString (expanded, sizeof (expanded), 0, cmd, compresshook_format_str,
+ (unsigned long) ctx, 0);
+ return safe_strdup (expanded);
+}
+ (unsigned long) ctx, 0);
+ return safe_strdup (expanded);
+}
Index: debian-mutt/compress.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
Index: debian-mutt/compress.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.h 2007-04-12 18:56:02.000000000 +0200
++++ debian-mutt/compress.h 2007-05-16 23:54:01.000000000 +0200
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+void mutt_fast_close_compressed (CONTEXT *);
Index: debian-mutt/configure.ac
===================================================================
+void mutt_fast_close_compressed (CONTEXT *);
Index: debian-mutt/configure.ac
===================================================================
---- debian-mutt.orig/configure.ac 2007-04-12 18:15:14.000000000 +0200
-+++ debian-mutt/configure.ac 2007-04-12 18:56:02.000000000 +0200
-@@ -803,6 +803,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+--- debian-mutt.orig/configure.ac 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/configure.ac 2007-05-16 23:54:02.000000000 +0200
+@@ -785,6 +785,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
Index: debian-mutt/curs_main.c
===================================================================
AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
Index: debian-mutt/curs_main.c
===================================================================
---- debian-mutt.orig/curs_main.c 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/curs_main.c 2007-04-12 18:56:02.000000000 +0200
-@@ -1096,6 +1096,11 @@ int mutt_index_menu (void)
+--- debian-mutt.orig/curs_main.c 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/curs_main.c 2007-05-17 00:13:50.000000000 +0200
+@@ -1111,6 +1111,11 @@ int mutt_index_menu (void)
Index: debian-mutt/doc/manual.xml.head
===================================================================
Index: debian-mutt/doc/manual.xml.head
===================================================================
---- debian-mutt.orig/doc/manual.xml.head 2007-04-07 14:44:33.000000000 +0200
-+++ debian-mutt/doc/manual.xml.head 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/doc/manual.xml.head 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/doc/manual.xml.head 2007-05-17 00:13:50.000000000 +0200
@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
</chapter>
@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
</chapter>
Index: debian-mutt/doc/muttrc.man.head
===================================================================
Index: debian-mutt/doc/muttrc.man.head
===================================================================
---- debian-mutt.orig/doc/muttrc.man.head 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/doc/muttrc.man.head 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/doc/muttrc.man.head 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/doc/muttrc.man.head 2007-05-16 23:54:01.000000000 +0200
@@ -345,6 +345,24 @@ specify the ID of the public key to be u
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,
@@ -345,6 +345,24 @@ specify the ID of the public key to be u
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,
This command adds the named \fIstring\fP to the keyboard buffer.
Index: debian-mutt/hook.c
===================================================================
This command adds the named \fIstring\fP to the keyboard buffer.
Index: debian-mutt/hook.c
===================================================================
---- debian-mutt.orig/hook.c 2007-04-12 18:15:14.000000000 +0200
-+++ debian-mutt/hook.c 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/hook.c 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/hook.c 2007-05-16 23:54:01.000000000 +0200
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
)
Index: debian-mutt/init.h
===================================================================
)
Index: debian-mutt/init.h
===================================================================
---- debian-mutt.orig/init.h 2007-04-12 18:15:14.000000000 +0200
-+++ debian-mutt/init.h 2007-04-12 18:56:02.000000000 +0200
-@@ -3128,6 +3128,11 @@ struct command_t Commands[] = {
+--- debian-mutt.orig/init.h 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/init.h 2007-05-17 00:13:50.000000000 +0200
+@@ -3129,6 +3129,11 @@ struct command_t Commands[] = {
{ "fcc-hook", mutt_parse_hook, M_FCCHOOK },
{ "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK },
{ "folder-hook", mutt_parse_hook, M_FOLDERHOOK },
{ "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 },
Index: debian-mutt/main.c
===================================================================
{ "hdr_order", parse_list, UL &HeaderOrderList },
Index: debian-mutt/main.c
===================================================================
---- debian-mutt.orig/main.c 2007-04-12 18:15:14.000000000 +0200
-+++ debian-mutt/main.c 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/main.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/main.c 2007-05-16 23:54:01.000000000 +0200
@@ -401,6 +401,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
@@ -401,6 +401,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
"+HAVE_WC_FUNCS "
Index: debian-mutt/Makefile.am
===================================================================
"+HAVE_WC_FUNCS "
Index: debian-mutt/Makefile.am
===================================================================
---- debian-mutt.orig/Makefile.am 2007-04-07 14:44:20.000000000 +0200
-+++ debian-mutt/Makefile.am 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/Makefile.am 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/Makefile.am 2007-05-16 23:54:01.000000000 +0200
@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
Index: debian-mutt/mbox.c
===================================================================
mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
Index: debian-mutt/mbox.c
===================================================================
---- debian-mutt.orig/mbox.c 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/mbox.c 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/mbox.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mbox.c 2007-05-16 23:54:01.000000000 +0200
@@ -29,6 +29,10 @@
#include "copy.h"
#include "mutt_curses.h"
@@ -29,6 +29,10 @@
#include "copy.h"
#include "mutt_curses.h"
return 0;
Index: debian-mutt/mutt.h
===================================================================
return 0;
Index: debian-mutt/mutt.h
===================================================================
---- debian-mutt.orig/mutt.h 2007-04-12 18:15:14.000000000 +0200
-+++ debian-mutt/mutt.h 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/mutt.h 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mutt.h 2007-05-17 00:13:50.000000000 +0200
@@ -160,6 +160,11 @@ typedef enum
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
@@ -160,6 +160,11 @@ typedef enum
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
Index: debian-mutt/mx.c
===================================================================
unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
Index: debian-mutt/mx.c
===================================================================
---- debian-mutt.orig/mx.c 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/mx.c 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/mx.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mx.c 2007-05-17 00:13:49.000000000 +0200
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
if (ctx->locked) lock = 0;
Index: debian-mutt/mx.h
===================================================================
if (ctx->locked) lock = 0;
Index: debian-mutt/mx.h
===================================================================
---- debian-mutt.orig/mx.h 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/mx.h 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/mx.h 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/mx.h 2007-05-16 23:54:01.000000000 +0200
@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
Index: debian-mutt/PATCHES
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
Index: debian-mutt/PATCHES
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/PATCHES 2007-04-12 18:56:02.000000000 +0200
++++ debian-mutt/PATCHES 2007-05-17 00:13:50.000000000 +0200
@@ -0,0 +1 @@
+patch-1.5.14.rr.compressed.1
Index: debian-mutt/po/de.po
===================================================================
@@ -0,0 +1 @@
+patch-1.5.14.rr.compressed.1
Index: debian-mutt/po/de.po
===================================================================
---- debian-mutt.orig/po/de.po 2007-04-07 14:44:33.000000000 +0200
-+++ debian-mutt/po/de.po 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/po/de.po 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/po/de.po 2007-05-16 23:54:01.000000000 +0200
@@ -1280,6 +1280,48 @@ msgstr "Prüfung des Absenders fehlgeschl
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
@@ -1280,6 +1280,48 @@ msgstr "Prüfung des Absenders fehlgeschl
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#. * never happen, is we presume it is a bug in mutt.
Index: debian-mutt/po/POTFILES.in
===================================================================
#. * never happen, is we presume it is a bug in mutt.
Index: debian-mutt/po/POTFILES.in
===================================================================
---- debian-mutt.orig/po/POTFILES.in 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/po/POTFILES.in 2007-04-12 18:56:02.000000000 +0200
+--- debian-mutt.orig/po/POTFILES.in 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/po/POTFILES.in 2007-05-16 23:54:01.000000000 +0200
@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
cryptglue.c
Index: debian-mutt/status.c
===================================================================
cryptglue.c
Index: debian-mutt/status.c
===================================================================
---- debian-mutt.orig/status.c 2007-04-03 21:43:38.000000000 +0200
-+++ debian-mutt/status.c 2007-04-12 18:56:02.000000000 +0200
-@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
+--- debian-mutt.orig/status.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/status.c 2007-05-17 00:13:49.000000000 +0200
+@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf
case 'f':
snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
case 'f':
snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
- Fixed indentation of "appended" in mutt.h.
== END PATCH
- Fixed indentation of "appended" in mutt.h.
== END PATCH
+Index: debian-mutt/commands.c
===================================================================
===================================================================
---- trash.orig/commands.c 2006-12-12 14:15:02.000000000 +0100
-+++ trash/commands.c 2007-02-15 19:34:10.324888040 +0100
-@@ -690,6 +690,7 @@ int _mutt_save_message (HEADER *h, CONTE
+--- debian-mutt.orig/commands.c 2007-04-12 19:06:45.000000000 +0200
++++ debian-mutt/commands.c 2007-05-16 23:09:20.000000000 +0200
+@@ -688,6 +688,7 @@ int _mutt_save_message (HEADER *h, CONTE
if (option (OPTDELETEUNTAG))
mutt_set_flag (Context, h, M_TAG, 0);
}
if (option (OPTDELETEUNTAG))
mutt_set_flag (Context, h, M_TAG, 0);
}
+Index: debian-mutt/flags.c
===================================================================
===================================================================
---- trash.orig/flags.c 2006-12-12 14:15:02.000000000 +0100
-+++ trash/flags.c 2007-02-15 19:34:10.325887888 +0100
-@@ -66,7 +66,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
- else if (h->deleted)
+--- debian-mutt.orig/flags.c 2007-05-16 23:08:46.000000000 +0200
++++ debian-mutt/flags.c 2007-05-16 23:43:45.000000000 +0200
+@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
- if (upd_ctx) ctx->deleted--;
+ if (upd_ctx)
+ {
- if (upd_ctx) ctx->deleted--;
+ if (upd_ctx)
+ {
#ifdef USE_IMAP
/* see my comment above */
if (ctx->magic == M_IMAP)
#ifdef USE_IMAP
/* see my comment above */
if (ctx->magic == M_IMAP)
-@@ -88,6 +94,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
case M_NEW:
if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
case M_NEW:
if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
+Index: debian-mutt/globals.h
===================================================================
===================================================================
---- trash.orig/globals.h 2007-01-04 15:23:49.000000000 +0100
-+++ trash/globals.h 2007-02-15 19:34:10.325887888 +0100
-@@ -135,6 +135,7 @@ WHERE char *StChars;
+--- debian-mutt.orig/globals.h 2007-05-16 23:09:10.000000000 +0200
++++ debian-mutt/globals.h 2007-05-16 23:09:20.000000000 +0200
+@@ -142,6 +142,7 @@ WHERE char *StChars;
WHERE char *Status;
WHERE char *Tempdir;
WHERE char *Tochars;
+WHERE char *TrashPath;
WHERE char *Username;
WHERE char *Visual;
WHERE char *Status;
WHERE char *Tempdir;
WHERE char *Tochars;
+WHERE char *TrashPath;
WHERE char *Username;
WHERE char *Visual;
-
-Index: trash/imap/message.c
+ WHERE char *XtermTitle;
+Index: debian-mutt/imap/message.c
===================================================================
===================================================================
---- trash.orig/imap/message.c 2007-02-14 15:32:38.000000000 +0100
-+++ trash/imap/message.c 2007-02-15 19:34:10.325887888 +0100
-@@ -817,6 +817,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+--- debian-mutt.orig/imap/message.c 2007-05-16 23:08:46.000000000 +0200
++++ debian-mutt/imap/message.c 2007-05-16 23:09:20.000000000 +0200
+@@ -816,6 +816,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
if (ctx->hdrs[n]->tagged)
{
mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
if (ctx->hdrs[n]->tagged)
{
mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
}
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
}
-@@ -824,6 +825,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
else
{
mutt_set_flag (ctx, h, M_DELETE, 1);
else
{
mutt_set_flag (ctx, h, M_DELETE, 1);
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, h, M_TAG, 0);
}
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, h, M_TAG, 0);
}
+Index: debian-mutt/init.h
===================================================================
===================================================================
---- trash.orig/init.h 2006-12-12 14:15:03.000000000 +0100
-+++ trash/init.h 2007-02-15 19:34:10.326887736 +0100
-@@ -2808,6 +2808,16 @@ struct option_t MuttVars[] = {
+--- debian-mutt.orig/init.h 2007-05-16 23:09:10.000000000 +0200
++++ debian-mutt/init.h 2007-05-16 23:09:20.000000000 +0200
+@@ -2873,6 +2873,16 @@ struct option_t MuttVars[] = {
** by \fIyou\fP. The sixth character is used to indicate when a mail
** was sent to a mailing-list you subscribe to (default: L).
*/
** by \fIyou\fP. The sixth character is used to indicate when a mail
** was sent to a mailing-list you subscribe to (default: L).
*/
#ifdef USE_SOCKET
{ "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
/*
#ifdef USE_SOCKET
{ "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
/*
+Index: debian-mutt/mutt.h
===================================================================
===================================================================
---- trash.orig/mutt.h 2007-01-04 15:23:49.000000000 +0100
-+++ trash/mutt.h 2007-02-15 19:34:10.327887584 +0100
-@@ -200,6 +200,7 @@ enum
+--- debian-mutt.orig/mutt.h 2007-05-16 23:09:10.000000000 +0200
++++ debian-mutt/mutt.h 2007-05-16 23:09:20.000000000 +0200
+@@ -206,6 +206,7 @@ enum
M_DELETE,
M_UNDELETE,
M_DELETED,
M_DELETE,
M_UNDELETE,
M_DELETED,
-@@ -703,6 +704,7 @@ typedef struct header
+@@ -718,6 +719,7 @@ typedef struct header
unsigned int mime : 1; /* has a MIME-Version header? */
unsigned int flagged : 1; /* marked important? */
unsigned int tagged : 1;
unsigned int mime : 1; /* has a MIME-Version header? */
unsigned int flagged : 1; /* marked important? */
unsigned int tagged : 1;
unsigned int deleted : 1;
unsigned int changed : 1;
unsigned int attach_del : 1; /* has an attachment marked for deletion */
unsigned int deleted : 1;
unsigned int changed : 1;
unsigned int attach_del : 1; /* has an attachment marked for deletion */
-@@ -873,6 +875,7 @@ typedef struct
+@@ -889,6 +891,7 @@ typedef struct _context
int new; /* how many new messages? */
int unread; /* how many unread messages? */
int deleted; /* how many deleted messages */
+ int appended; /* how many saved messages? */
int flagged; /* how many flagged messages */
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
int new; /* how many new messages? */
int unread; /* how many unread messages? */
int deleted; /* how many deleted messages */
+ int appended; /* how many saved messages? */
int flagged; /* how many flagged messages */
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
- #if defined USE_POP || defined USE_IMAP
-Index: trash/muttlib.c
+
+Index: debian-mutt/muttlib.c
===================================================================
===================================================================
---- trash.orig/muttlib.c 2007-01-04 15:23:50.000000000 +0100
-+++ trash/muttlib.c 2007-02-15 19:34:10.327887584 +0100
-@@ -1265,7 +1265,9 @@ int mutt_save_confirm (const char *s, st
+--- debian-mutt.orig/muttlib.c 2007-05-16 23:08:47.000000000 +0200
++++ debian-mutt/muttlib.c 2007-05-16 23:09:20.000000000 +0200
+@@ -1384,7 +1384,9 @@ int mutt_save_confirm (const char *s, st
if (magic > 0 && !mx_access (s, W_OK))
{
if (magic > 0 && !mx_access (s, W_OK))
{
{
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
{
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
===================================================================
===================================================================
---- trash.orig/mx.c 2006-12-12 14:15:03.000000000 +0100
-+++ trash/mx.c 2007-02-15 19:34:10.328887432 +0100
-@@ -822,6 +822,53 @@ static int sync_mailbox (CONTEXT *ctx, i
+--- debian-mutt.orig/mx.c 2007-05-16 23:09:10.000000000 +0200
++++ debian-mutt/mx.c 2007-05-16 23:09:20.000000000 +0200
+@@ -838,6 +838,53 @@ static int sync_mailbox (CONTEXT *ctx, i
/* save changes and close mailbox */
int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
{
/* save changes and close mailbox */
int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
{
-@@ -957,6 +1004,7 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -973,6 +1020,7 @@ int mx_close_mailbox (CONTEXT *ctx, int
if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
{
mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
{
mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
-@@ -978,6 +1026,14 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -994,6 +1042,14 @@ int mx_close_mailbox (CONTEXT *ctx, int
#ifdef USE_IMAP
/* allow IMAP to preserve the deleted flag across sessions */
if (ctx->magic == M_IMAP)
#ifdef USE_IMAP
/* allow IMAP to preserve the deleted flag across sessions */
if (ctx->magic == M_IMAP)
-@@ -1173,6 +1229,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
+@@ -1194,6 +1250,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
msgcount = ctx->msgcount;
deleted = ctx->deleted;
msgcount = ctx->msgcount;
deleted = ctx->deleted;
#ifdef USE_IMAP
if (ctx->magic == M_IMAP)
rc = imap_sync_mailbox (ctx, purge, index_hint);
#ifdef USE_IMAP
if (ctx->magic == M_IMAP)
rc = imap_sync_mailbox (ctx, purge, index_hint);
+Index: debian-mutt/postpone.c
===================================================================
===================================================================
---- trash.orig/postpone.c 2006-12-12 14:15:03.000000000 +0100
-+++ trash/postpone.c 2007-02-15 19:34:10.328887432 +0100
+--- debian-mutt.orig/postpone.c 2007-04-12 19:06:45.000000000 +0200
++++ debian-mutt/postpone.c 2007-05-16 23:09:20.000000000 +0200
@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HE
/* finished with this message, so delete it. */
mutt_set_flag (PostContext, h, M_DELETE, 1);
@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HE
/* finished with this message, so delete it. */
mutt_set_flag (PostContext, h, M_DELETE, 1);
/* update the count for the status display */
PostCount = PostContext->msgcount - PostContext->deleted;
/* update the count for the status display */
PostCount = PostContext->msgcount - PostContext->deleted;
+Index: debian-mutt/PATCHES
===================================================================
===================================================================
---- trash/PATCHES.orig 2007-02-15 19:35:06.277381968 +0100
-+++ trash/PATCHES 2007-02-15 19:35:06.277381968 +0100
-@@ -0,0 +1 @@
+--- debian-mutt.orig/PATCHES 2007-05-16 23:09:10.000000000 +0200
++++ debian-mutt/PATCHES 2007-05-16 23:09:20.000000000 +0200
+@@ -1,3 +1,4 @@
+patch-1.5.13.cd.trash_folder.3.4
+patch-1.5.13.cd.trash_folder.3.4
+ patch-1.5.13.nt+ab.xtitles.4
+ patch-1.5.6.dw.maildir-mtime.1
+ patch-1.5.13.cd.ifdef.2
projects / software / mutt-debian.git / commitdiff