diff options
29 files changed, 407 insertions, 622 deletions
@@ -1,7 +1,7 @@ pkgbase = mutt-patched pkgdesc = Small but very powerful text-based mail client (plus a huge pile of patches mostly from debian) - pkgver = 1.5.23 - pkgrel = 5 + pkgver = 1.5.24 + pkgrel = 1 url = http://www.mutt.org/ install = install arch = i686 @@ -21,11 +21,10 @@ pkgbase = mutt-patched provides = mutt conflicts = mutt backup = etc/Muttrc - source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.5.23.tar.gz + source = https://bitbucket.org/mutt/mutt/downloads/mutt-1.5.24.tar.gz source = backport-gnutls-fix.patch source = am-maintainer-mode.patch source = ifdef.patch - source = xtitles.patch source = trash-folder.patch source = purge-message.patch source = imap_fast_trash.patch @@ -51,14 +50,12 @@ pkgbase = mutt-patched source = 542817-smimekeys-tmpdir.patch source = 548577-gpgme-1.2.patch source = 553321-ansi-escape-segfault.patch - source = 547980-smime_keys-chaining.patch source = 528233-readonly-open.patch source = 228671-pipe-mime.patch source = 383769-score-match.patch source = 603288-split-fetches.patch source = 611410-no-implicit_autoview-for-text-html.patch source = path_max.patch - source = update_german_translation.patch source = sidebar.patch source = sidebar-dotpathsep.patch source = sidebar-utf8.patch @@ -68,53 +65,50 @@ pkgbase = mutt-patched source = sidebar-compose.patch source = sidebar-new.patch source = nntp.patch - sha1sums = 8ac821d8b1e25504a31bf5fda9c08d93a4acc862 + sha1sums = 38a2da5eb01ff83a90a2caee28fa2e95dbfe6898 sha1sums = 018575fea153952423d4d512ca2fdfc2e49d669f sha1sums = 1ad77bdf742ff584b5695f1908dde83044195c0e - sha1sums = 3aca6a18ac32b8f6c15216e6fb928a05320c5b74 - sha1sums = ff3b66e57faaa163e3e6512f81fdbbea9e02a0bd - sha1sums = 5c1eae78cb8636025916e7d83c192f6c32981ff3 - sha1sums = c6eaf7fb1829809e7f07d039f75ab30de02d7873 - sha1sums = 72a35dfd4476238db3500f3a5651996691c1ce20 + sha1sums = 92fe7a726545424db6fc0f8b0612eeeeabb0fef4 + sha1sums = cce6c3484941a461c0852fccc6da4c89cfabd3d3 + sha1sums = 2bf687eb20801706f85b8f88c87eb259f5c65d63 + sha1sums = 9ac8aa4d41fd40c8a8866232826b1076a6a4d950 sha1sums = e3e7b9c5b17be4032e111edb6a6999a3185c8f7b - sha1sums = 61630d6a6c3fdf7480c7b6a0e75552500c48f5f4 - sha1sums = a7546f9616460da23e87957b0ce98776113b5f7b + sha1sums = 84b7d5debe1dba52f31114860fab680cea538302 + sha1sums = 0270af48a6b67124564ebe8809dcb82a67fbf391 sha1sums = 6a53e85ee55c14beda0000de89a397f589cb29a7 sha1sums = b841ad389301d336ba533356d057ea1f09bc150b - sha1sums = ee72ecb042e337427b5d9c31ff1ecb78b440e2ff - sha1sums = 773c59af8755b6daa1d73749fa9c38ccf953285c - sha1sums = 0acf230d3b7e03b90239b256a6944ccf8a0b4e91 + sha1sums = 8dc84a70076dc85fa496ebc2d6cd1e04acb35973 + sha1sums = 1eac8b05b6793921e253412fc4ceb33f2898dd4a + sha1sums = f72c27cc10d4c585591f5437b4d92437a92682bb sha1sums = 12c74c647238e653c4db5f8eb7590c5723635b9c - sha1sums = 4dd818f69c4f302c5ca3e5a7fd95223112c853ac + sha1sums = f8c2d3cc93b11074d95f5a2809bb9f022432884f sha1sums = 464ca1c57f8a25177a586cb79b94398f694b32e3 - sha1sums = c44f9b5a3104917417d09dbcb0dda77f4566c30a - sha1sums = 206daf4a78f801d9835c8096c83181569ae74136 - sha1sums = 061afb767a30fb78d48b0de1e30aea2f0b3b9d5d + sha1sums = 3e6846095d48d12453474919c5a2e1ce56294107 + sha1sums = 2006013bbba89e5b95659347aa14938732c5312d + sha1sums = a2baa71018743fb63704ea911931490668d62c0b sha1sums = 42ab3017961819669c678e7456657ca677c8eb56 - sha1sums = 8ae07c06cc9a552b7152c4e264b6284cd770a29c - sha1sums = ad645521bcd36a758e10cf0e2e2e8123c3c9a229 + sha1sums = 8b54cc0190e62c138e4ff6769310661006a49e2f + sha1sums = 81d33556b66c721f2f25cd1f5485536999a7cb72 sha1sums = f1ee08450995fe21e0dc3807563e7120d2e3d04a sha1sums = f2b98a258d5ee18f731aab975f5b0dd17945f228 sha1sums = 98d958231c05fa1ddf5f1a0ab67a2dc6cefa8418 - sha1sums = c8ac575a36876d711a16be09425301c4800bf21c + sha1sums = a247d69731c0df74a7e0f19d9206c3abeacb160a sha1sums = 6ec4a7614dc78d230a9ebe8ec645393a98be41a4 - sha1sums = f91ac0baf4eda090da7b80e272d422f234b459cd sha1sums = 03a42b8914c9ef1f684275cba355046de14b1c03 sha1sums = 1b53316b0c09333dbee428448a6f565378ff5357 sha1sums = 8121dd0a07f6f98377e1b1ad3659deaec3a83b6b sha1sums = d4803ee5f29e9e495e12bf012dc938d7cd4adc47 - sha1sums = 561b600c79988975f034c9237158fb991ec92541 + sha1sums = 7a7cefe2433bd5bb4bb678be029b6d12f14fa1e6 sha1sums = f91499aa8bee5827924e6c860bd853e0344d55bc - sha1sums = f99082007d3cb4486b96cb22d1fae1c71fdbe51e - sha1sums = fcdeb12e49735268c080e34c2d88211a7ccb8493 - sha1sums = 487850ffc2a6d639d9d17b3ced844257799a84a9 + sha1sums = 604784b914e4c03743a62b33745a16037df090f3 + sha1sums = 2fdfd1dcb9b45068c1c890d30e3dcc3a83a401a3 sha1sums = c01c8f84e3ea4ac71caf31edeb6adb062eb04fe0 - sha1sums = 2ba91afb71dc40793bac8198fd9f8d6500bd1ce3 - sha1sums = e7181b191f06bd6c74c6e35372dba6dc3f8c4653 + sha1sums = 71915a816d1995bdb11d021c9eac09ee28efda97 + sha1sums = 0a9eb71f95f109a44688d4930dfb6eccf74cf682 sha1sums = 19fd36f9a1f15d4481f08d90f9a88d3912e12cdb - sha1sums = b648cb9ab1a0b447417647a82856af01a9a418e5 - sha1sums = 230973eb243265ee75bd098f0f8286690bed2d08 - sha1sums = 8d7d858e47bbb2c736c9d09de843d3892888e9c5 + sha1sums = ba0a5082ef9da710644f4bd71d08b25ccfb7fb8a + sha1sums = ffc14992c112e262d994929102369df2be729ea9 + sha1sums = f0f0278d0b369d7d42c338f0c751e46fa5ec915a pkgname = mutt-patched diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..dcc27807b204 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +orig diff --git a/467432-write_bcc.patch b/467432-write_bcc.patch index 1948e87abf07..3b68d2fc8806 100644 --- a/467432-write_bcc.patch +++ b/467432-write_bcc.patch @@ -2,7 +2,7 @@ From: Antonio Radici <antonio@debian.org> Date: Thu, 27 Feb 2014 16:22:51 +0100 Subject: 467432-write_bcc MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The purpose of this patch is to alter the behavior of the write_bcc option @@ -43,10 +43,10 @@ index 578b33d..f701c8e 100644 /* now copy the body of the message. */ diff --git a/init.h b/init.h -index 875cad8..42b79d6 100644 +index ec88f92..e370b3a 100644 --- a/init.h +++ b/init.h -@@ -3440,14 +3440,9 @@ struct option_t MuttVars[] = { +@@ -3539,14 +3539,9 @@ struct option_t MuttVars[] = { { "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1}, /* ** .pp @@ -65,10 +65,10 @@ index 875cad8..42b79d6 100644 { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 }, /* diff --git a/protos.h b/protos.h -index 8542f91..38c8c01 100644 +index 2ba4d1d..799ac9b 100644 --- a/protos.h +++ b/protos.h -@@ -366,7 +366,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int, char +@@ -368,7 +368,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int, char int mutt_write_mime_body (BODY *, FILE *); int mutt_write_mime_header (BODY *, FILE *); int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags); @@ -78,7 +78,7 @@ index 8542f91..38c8c01 100644 int mutt_yesorno (const char *, int); void mutt_set_header_color(CONTEXT *, HEADER *); diff --git a/send.c b/send.c -index fce003c..18b9390 100644 +index d4e2a79..6dd26c0 100644 --- a/send.c +++ b/send.c @@ -994,10 +994,10 @@ static int send_message (HEADER *msg) @@ -95,10 +95,10 @@ index fce003c..18b9390 100644 #ifdef USE_SMTP if (old_write_bcc) diff --git a/sendlib.c b/sendlib.c -index cede853..0f05298 100644 +index a74874d..689a112 100644 --- a/sendlib.c +++ b/sendlib.c -@@ -1929,7 +1929,7 @@ out: +@@ -1936,7 +1936,7 @@ out: int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, @@ -107,7 +107,7 @@ index cede853..0f05298 100644 { char buffer[LONG_STRING]; char *p, *q; -@@ -1972,7 +1972,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, +@@ -1979,7 +1979,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, else if (mode > 0) fputs ("Cc: \n", fp); @@ -116,7 +116,7 @@ index cede853..0f05298 100644 { if(mode != 0 || option(OPTWRITEBCC)) { -@@ -2727,7 +2727,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, +@@ -2738,7 +2738,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ diff --git a/547980-smime_keys-chaining.patch b/547980-smime_keys-chaining.patch deleted file mode 100644 index 0b4c56a9d78e..000000000000 --- a/547980-smime_keys-chaining.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Antonio Radici <antonio@debian.org> -Date: Thu, 27 Feb 2014 17:03:15 +0100 -Subject: 547980-smime_keys-chaining - -To suppose certificate chaining in smime_keys, -see upstream http://bugs.mutt.org/3339 - -Gbp-Pq: Topic upstream ---- - smime_keys.pl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 48 insertions(+), 9 deletions(-) - -diff --git a/smime_keys.pl b/smime_keys.pl -index 2f4544a..2a78e39 100755 ---- a/smime_keys.pl -+++ b/smime_keys.pl -@@ -81,6 +81,30 @@ if ( -d $root_certs_path) { - # OPS - # - -+ -+sub get_certs { -+ my $file = shift; -+ return undef unless (defined($file) && -e $file); -+ -+ open IN, "<$file"; -+ -+ my @certs = (); -+ my $in_cert = 0; -+ my $cert = q{}; -+ while ( <IN> ) { -+ $in_cert = 1 if ( /^-----BEGIN CERTIFICATE-----$/ ); -+ $cert .= $_; -+ -+ if ( /^-----END CERTIFICATE-----$/ ) { -+ push @certs, $cert; -+ $cert = q{}; -+ $in_cert = 0; -+ } -+ } -+ -+ return @certs; -+} -+ - if(@ARGV == 1 and $ARGV[0] eq "init") { - init_paths; - } -@@ -91,13 +115,27 @@ elsif(@ARGV == 2 and $ARGV[0] eq "label") { - change_label($ARGV[1]); - } - elsif(@ARGV == 2 and $ARGV[0] eq "add_cert") { -- my $format = -B $ARGV[1] ? 'DER' : 'PEM'; -- my $cmd = "$opensslbin x509 -noout -hash -in $ARGV[1] -inform $format"; -- my $cert_hash = `$cmd`; -- $? and die "'$cmd' returned $?"; -- chomp($cert_hash); -- my $label = query_label; -- &add_certificate($ARGV[1], \$cert_hash, 1, $label, '?'); -+ foreach my $cert ( get_certs( $ARGV[1] ) ) { -+ -+ my $file = sprintf( '/tmp/smime-%d.%d', $$, int(rand( 999999 ) ) ); -+ print STDERR "TMPFILE: $file\n"; -+ if ( -e $file ) { -+ die( "ERROR: TMPFILE $file existss?!?!" ); -+ } -+ open OUT, ">$file"; -+ print OUT $cert; -+ close OUT; -+ -+ my $format = -B $file ? 'DER' : 'PEM'; -+ my $cmd = "$opensslbin x509 -noout -hash -in $file -inform $format"; -+ -+ my $cert_hash = `$cmd`; -+ $? and die "'$cmd' returned $?"; -+ chomp($cert_hash); -+ my $label = query_label; -+ &add_certificate($ARGV[1], \$cert_hash, 1, $label, '?'); -+ unlink $file; -+ } - } - elsif(@ARGV == 2 and $ARGV[0] eq "add_pem") { - -e $ARGV[1] and -s $ARGV[1] or die("$ARGV[1] is nonexistent or empty."); -@@ -381,9 +419,10 @@ sub query_label () { - print "the key ID. This has to be _one_ word (no whitespaces).\n\n"; - - print "Enter label: "; -- chomp($input = <STDIN>); -+ $input = <STDIN>; -+ chomp($input) if ( defined($input) ); - -- my ($label, $junk) = split(/\s/, $input, 2); -+ my ($label, $junk) = split(/\s/, $input, 2) if ( defined($input) ); - - defined $junk - and print "\nUsing '$label' as label; ignoring '$junk'\n"; diff --git a/548577-gpgme-1.2.patch b/548577-gpgme-1.2.patch index a0675e728f83..cd611cd617be 100644 --- a/548577-gpgme-1.2.patch +++ b/548577-gpgme-1.2.patch @@ -12,7 +12,7 @@ Gbp-Pq: Topic upstream 1 file changed, 8 insertions(+) diff --git a/init.c b/init.c -index e0a0757..20a66bd 100644 +index b08439e..d82772c 100644 --- a/init.c +++ b/init.c @@ -53,6 +53,10 @@ @@ -26,7 +26,7 @@ index e0a0757..20a66bd 100644 #define CHECK_PAGER \ if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && \ (MuttVars[idx].flags & R_RESORT)) \ -@@ -3277,6 +3281,10 @@ void mutt_init (int skip_sys_rc, LIST *commands) +@@ -3255,6 +3259,10 @@ void mutt_init (int skip_sys_rc, LIST *commands) mutt_read_histfile (); diff --git a/566076-build_doc_adjustments.patch b/566076-build_doc_adjustments.patch index a7e46749cd2b..a8cbe09a5052 100644 --- a/566076-build_doc_adjustments.patch +++ b/566076-build_doc_adjustments.patch @@ -10,10 +10,10 @@ Gbp-Pq: Topic debian-specific 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index f4e21bc..3676245 100644 +index bc8f856..979f31d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -106,9 +106,7 @@ uninstall-local: +@@ -109,9 +109,7 @@ uninstall-local: check: manual.txt: manual.html @@ -24,7 +24,7 @@ index f4e21bc..3676245 100644 Muttrc: stamp-doc-rc -@@ -120,10 +118,10 @@ stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head +@@ -123,10 +121,10 @@ stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head touch stamp-doc-rc manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css diff --git a/611410-no-implicit_autoview-for-text-html.patch b/611410-no-implicit_autoview-for-text-html.patch index 4ccc2d86345d..3bedea08479e 100644 --- a/611410-no-implicit_autoview-for-text-html.patch +++ b/611410-no-implicit_autoview-for-text-html.patch @@ -2,7 +2,7 @@ From: Antonio Radici <antonio@debian.org> Date: Thu, 27 Feb 2014 17:36:31 +0100 Subject: 611410-no-implicit_autoview-for-text-html MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" +Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch blacklist text/html from the list of documents that will be @@ -22,10 +22,10 @@ Gbp-Pq: Topic upstream 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/init.h b/init.h -index 42b79d6..08e004c 100644 +index e370b3a..35224c1 100644 --- a/init.h +++ b/init.h -@@ -1222,7 +1222,9 @@ struct option_t MuttVars[] = { +@@ -1251,7 +1251,9 @@ struct option_t MuttVars[] = { ** ``\fCcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have ** an internal viewer defined for. If such an entry is found, mutt will ** use the viewer defined in that entry to convert the body part to text @@ -37,10 +37,10 @@ index 42b79d6..08e004c 100644 { "include", DT_QUAD, R_NONE, OPT_INCLUDE, M_ASKYES }, /* diff --git a/muttlib.c b/muttlib.c -index 0425d45..c0d2026 100644 +index 0fd9766..c1d565f 100644 --- a/muttlib.c +++ b/muttlib.c -@@ -658,6 +658,9 @@ int mutt_needs_mailcap (BODY *m) +@@ -650,6 +650,9 @@ int mutt_needs_mailcap (BODY *m) switch (m->type) { case TYPETEXT: diff --git a/Md.etc_mailname_gethostbyname.patch b/Md.etc_mailname_gethostbyname.patch index 849ec54d032b..5e981ceb80a9 100644 --- a/Md.etc_mailname_gethostbyname.patch +++ b/Md.etc_mailname_gethostbyname.patch @@ -11,7 +11,7 @@ Gbp-Pq: Topic debian-specific 1 file changed, 41 insertions(+) diff --git a/init.c b/init.c -index 81bb9e7..1401664 100644 +index d95c9bc..767d43c 100644 --- a/init.c +++ b/init.c @@ -48,6 +48,7 @@ @@ -22,7 +22,7 @@ index 81bb9e7..1401664 100644 #include <errno.h> #include <sys/wait.h> #include <sys/time.h> -@@ -2965,6 +2966,31 @@ static void mutt_srandom (void) +@@ -2943,6 +2944,31 @@ static void mutt_srandom (void) srandom(seed); } @@ -54,7 +54,7 @@ index 81bb9e7..1401664 100644 void mutt_init (int skip_sys_rc, LIST *commands) { struct passwd *pw; -@@ -3041,10 +3067,25 @@ void mutt_init (int skip_sys_rc, LIST *commands) +@@ -3019,10 +3045,25 @@ void mutt_init (int skip_sys_rc, LIST *commands) Hostname = mutt_substrdup (utsname.nodename, p); p++; strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ @@ -3,8 +3,8 @@ # Contributor: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt-patched -pkgver=1.5.23 -pkgrel=5 +pkgver=1.5.24 +pkgrel=1 pkgdesc='Small but very powerful text-based mail client (plus a huge pile of patches mostly from debian)' url='http://www.mutt.org/' license=('GPL') @@ -21,7 +21,6 @@ source=( 'backport-gnutls-fix.patch' 'am-maintainer-mode.patch' 'ifdef.patch' - 'xtitles.patch' 'trash-folder.patch' 'purge-message.patch' 'imap_fast_trash.patch' @@ -47,14 +46,12 @@ source=( '542817-smimekeys-tmpdir.patch' '548577-gpgme-1.2.patch' '553321-ansi-escape-segfault.patch' - '547980-smime_keys-chaining.patch' '528233-readonly-open.patch' '228671-pipe-mime.patch' '383769-score-match.patch' '603288-split-fetches.patch' '611410-no-implicit_autoview-for-text-html.patch' 'path_max.patch' - 'update_german_translation.patch' 'sidebar.patch' 'sidebar-dotpathsep.patch' 'sidebar-utf8.patch' @@ -65,63 +62,58 @@ source=( 'sidebar-new.patch' 'nntp.patch' ) -sha1sums=('8ac821d8b1e25504a31bf5fda9c08d93a4acc862' +sha1sums=('38a2da5eb01ff83a90a2caee28fa2e95dbfe6898' '018575fea153952423d4d512ca2fdfc2e49d669f' '1ad77bdf742ff584b5695f1908dde83044195c0e' - '3aca6a18ac32b8f6c15216e6fb928a05320c5b74' - 'ff3b66e57faaa163e3e6512f81fdbbea9e02a0bd' - '5c1eae78cb8636025916e7d83c192f6c32981ff3' - 'c6eaf7fb1829809e7f07d039f75ab30de02d7873' - '72a35dfd4476238db3500f3a5651996691c1ce20' + '92fe7a726545424db6fc0f8b0612eeeeabb0fef4' + 'cce6c3484941a461c0852fccc6da4c89cfabd3d3' + '2bf687eb20801706f85b8f88c87eb259f5c65d63' + '9ac8aa4d41fd40c8a8866232826b1076a6a4d950' 'e3e7b9c5b17be4032e111edb6a6999a3185c8f7b' - '61630d6a6c3fdf7480c7b6a0e75552500c48f5f4' - 'a7546f9616460da23e87957b0ce98776113b5f7b' + '84b7d5debe1dba52f31114860fab680cea538302' + '0270af48a6b67124564ebe8809dcb82a67fbf391' '6a53e85ee55c14beda0000de89a397f589cb29a7' 'b841ad389301d336ba533356d057ea1f09bc150b' - 'ee72ecb042e337427b5d9c31ff1ecb78b440e2ff' - '773c59af8755b6daa1d73749fa9c38ccf953285c' - '0acf230d3b7e03b90239b256a6944ccf8a0b4e91' + '8dc84a70076dc85fa496ebc2d6cd1e04acb35973' + '1eac8b05b6793921e253412fc4ceb33f2898dd4a' + 'f72c27cc10d4c585591f5437b4d92437a92682bb' '12c74c647238e653c4db5f8eb7590c5723635b9c' - '4dd818f69c4f302c5ca3e5a7fd95223112c853ac' + 'f8c2d3cc93b11074d95f5a2809bb9f022432884f' '464ca1c57f8a25177a586cb79b94398f694b32e3' - 'c44f9b5a3104917417d09dbcb0dda77f4566c30a' - '206daf4a78f801d9835c8096c83181569ae74136' - '061afb767a30fb78d48b0de1e30aea2f0b3b9d5d' + '3e6846095d48d12453474919c5a2e1ce56294107' + '2006013bbba89e5b95659347aa14938732c5312d' + 'a2baa71018743fb63704ea911931490668d62c0b' '42ab3017961819669c678e7456657ca677c8eb56' - '8ae07c06cc9a552b7152c4e264b6284cd770a29c' - 'ad645521bcd36a758e10cf0e2e2e8123c3c9a229' + '8b54cc0190e62c138e4ff6769310661006a49e2f' + '81d33556b66c721f2f25cd1f5485536999a7cb72' 'f1ee08450995fe21e0dc3807563e7120d2e3d04a' 'f2b98a258d5ee18f731aab975f5b0dd17945f228' '98d958231c05fa1ddf5f1a0ab67a2dc6cefa8418' - 'c8ac575a36876d711a16be09425301c4800bf21c' + 'a247d69731c0df74a7e0f19d9206c3abeacb160a' '6ec4a7614dc78d230a9ebe8ec645393a98be41a4' - 'f91ac0baf4eda090da7b80e272d422f234b459cd' '03a42b8914c9ef1f684275cba355046de14b1c03' '1b53316b0c09333dbee428448a6f565378ff5357' '8121dd0a07f6f98377e1b1ad3659deaec3a83b6b' 'd4803ee5f29e9e495e12bf012dc938d7cd4adc47' - '561b600c79988975f034c9237158fb991ec92541' + '7a7cefe2433bd5bb4bb678be029b6d12f14fa1e6' 'f91499aa8bee5827924e6c860bd853e0344d55bc' - 'f99082007d3cb4486b96cb22d1fae1c71fdbe51e' - 'fcdeb12e49735268c080e34c2d88211a7ccb8493' - '487850ffc2a6d639d9d17b3ced844257799a84a9' + '604784b914e4c03743a62b33745a16037df090f3' + '2fdfd1dcb9b45068c1c890d30e3dcc3a83a401a3' 'c01c8f84e3ea4ac71caf31edeb6adb062eb04fe0' - '2ba91afb71dc40793bac8198fd9f8d6500bd1ce3' - 'e7181b191f06bd6c74c6e35372dba6dc3f8c4653' + '71915a816d1995bdb11d021c9eac09ee28efda97' + '0a9eb71f95f109a44688d4930dfb6eccf74cf682' '19fd36f9a1f15d4481f08d90f9a88d3912e12cdb' - 'b648cb9ab1a0b447417647a82856af01a9a418e5' - '230973eb243265ee75bd098f0f8286690bed2d08' - '8d7d858e47bbb2c736c9d09de843d3892888e9c5') + 'ba0a5082ef9da710644f4bd71d08b25ccfb7fb8a' + 'ffc14992c112e262d994929102369df2be729ea9' + 'f0f0278d0b369d7d42c338f0c751e46fa5ec915a') install=install prepare() { cd "${srcdir}/mutt-$pkgver" - patch -Np1 -i "${srcdir}/backport-gnutls-fix.patch" patch -Np1 -i "${srcdir}/am-maintainer-mode.patch" patch -Np1 -i "${srcdir}/ifdef.patch" - patch -Np1 -i "${srcdir}/xtitles.patch" patch -Np1 -i "${srcdir}/trash-folder.patch" patch -Np1 -i "${srcdir}/purge-message.patch" patch -Np1 -i "${srcdir}/imap_fast_trash.patch" @@ -144,17 +136,14 @@ prepare() { patch -Np1 -i "${srcdir}/fix-configure-test-operator.patch" patch -Np1 -i "${srcdir}/531430-imapuser.patch" patch -Np1 -i "${srcdir}/543467-thread-segfault.patch" - patch -Np1 -i "${srcdir}/542817-smimekeys-tmpdir.patch" patch -Np1 -i "${srcdir}/548577-gpgme-1.2.patch" patch -Np1 -i "${srcdir}/553321-ansi-escape-segfault.patch" - patch -Np1 -i "${srcdir}/547980-smime_keys-chaining.patch" patch -Np1 -i "${srcdir}/528233-readonly-open.patch" patch -Np1 -i "${srcdir}/228671-pipe-mime.patch" patch -Np1 -i "${srcdir}/383769-score-match.patch" patch -Np1 -i "${srcdir}/603288-split-fetches.patch" patch -Np1 -i "${srcdir}/611410-no-implicit_autoview-for-text-html.patch" patch -Np1 -i "${srcdir}/path_max.patch" - patch -Np1 -i "${srcdir}/update_german_translation.patch" patch -Np1 -i "${srcdir}/sidebar.patch" patch -Np1 -i "${srcdir}/sidebar-dotpathsep.patch" patch -Np1 -i "${srcdir}/sidebar-utf8.patch" diff --git a/compressed-folders.patch b/compressed-folders.patch index b752564cd7f4..ff9a8f1a03d4 100644 --- a/compressed-folders.patch +++ b/compressed-folders.patch @@ -40,18 +40,18 @@ Gbp-Pq: Topic features mx.c | 42 ++++- mx.h | 3 + po/POTFILES.in | 1 + - po/de.po | 30 ++++ + po/de.po | 29 +++ status.c | 8 + - 17 files changed, 883 insertions(+), 3 deletions(-) + 17 files changed, 882 insertions(+), 3 deletions(-) create mode 100644 compress.c create mode 100644 compress.h diff --git a/Makefile.am b/Makefile.am -index 8166b1b..09dd64b 100644 +index baff538..5dfeff6 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -22,7 +22,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) - bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ +@@ -23,7 +23,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) + bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET) mutt_SOURCES = \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ - crypt.c cryptglue.c \ @@ -59,7 +59,7 @@ index 8166b1b..09dd64b 100644 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 \ -@@ -61,7 +61,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \ +@@ -60,7 +60,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \ bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -607,10 +607,10 @@ index 0000000..9dbf027 +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); diff --git a/configure.ac b/configure.ac -index 3d5f11b..e7ebe01 100644 +index 6a1344e..5eed08f 100644 --- a/configure.ac +++ b/configure.ac -@@ -812,6 +812,11 @@ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of +@@ -830,6 +830,11 @@ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -623,10 +623,10 @@ index 3d5f11b..e7ebe01 100644 [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", diff --git a/curs_main.c b/curs_main.c -index d266708..e7f11bd 100644 +index 1de79f3..9d718ee 100644 --- a/curs_main.c +++ b/curs_main.c -@@ -1154,6 +1154,11 @@ int mutt_index_menu (void) +@@ -1218,6 +1218,11 @@ int mutt_index_menu (void) { int check; @@ -639,10 +639,10 @@ index d266708..e7f11bd 100644 oldcount = Context ? Context->msgcount : 0; diff --git a/doc/manual.xml.head b/doc/manual.xml.head -index 18ae918..4366758 100644 +index 8948459..f7a9387 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -6121,6 +6121,205 @@ selection. Highest priority has the mailbox given with the +@@ -6197,6 +6197,205 @@ selection. Highest priority has the mailbox given with the </chapter> @@ -849,13 +849,13 @@ index 18ae918..4366758 100644 <title>Mutt's MIME Support</title> diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head -index 30b96a2..b0ed18c 100644 +index 0b5658c..b9bc647 100644 --- a/doc/muttrc.man.head +++ b/doc/muttrc.man.head -@@ -354,6 +354,24 @@ specify the ID of the public key to be used when encrypting messages - 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. +@@ -359,6 +359,24 @@ You may use multiple + \fBcrypt-hook\fPs result in the use of multiple \fIkey-id\fPs for + a recipient. + +.PP +.nf +\fBopen-hook\fP \fIregexp\fP "\fIcommand\fP" @@ -878,7 +878,7 @@ index 30b96a2..b0ed18c 100644 \fBpush\fP \fIstring\fP This command adds the named \fIstring\fP to the keyboard buffer. diff --git a/hook.c b/hook.c -index 34f3106..2a27419 100644 +index a89b615..06f7c8e 100644 --- a/hook.c +++ b/hook.c @@ -24,6 +24,10 @@ @@ -892,7 +892,7 @@ index 34f3106..2a27419 100644 #include <limits.h> #include <string.h> #include <stdlib.h> -@@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) +@@ -109,6 +113,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) memset (&pattern, 0, sizeof (pattern)); pattern.data = safe_strdup (path); } @@ -910,10 +910,10 @@ index 34f3106..2a27419 100644 && (!WithCrypto || !(data & M_CRYPTHOOK)) ) diff --git a/init.h b/init.h -index a64992a..0e4f47f 100644 +index e3bcc89..a1c4180 100644 --- a/init.h +++ b/init.h -@@ -3578,6 +3578,11 @@ const struct command_t Commands[] = { +@@ -3665,6 +3665,11 @@ const 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 }, @@ -926,7 +926,7 @@ index a64992a..0e4f47f 100644 { "ungroup", parse_group, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, diff --git a/main.c b/main.c -index 0ce245b..5ab1868 100644 +index 17e8bf4..e71bc9b 100644 --- a/main.c +++ b/main.c @@ -431,6 +431,12 @@ static void show_version (void) @@ -971,7 +971,7 @@ index 253061a..6d3b6bd 100644 mx_fastclose_mailbox (ctx); return 0; diff --git a/mutt.h b/mutt.h -index 8cee3d2..b71f071 100644 +index ef41afd..1ae000b 100644 --- a/mutt.h +++ b/mutt.h @@ -144,6 +144,11 @@ typedef enum @@ -986,7 +986,7 @@ index 8cee3d2..b71f071 100644 /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -889,6 +894,11 @@ typedef struct _context +@@ -893,6 +898,11 @@ typedef struct _context int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ @@ -999,7 +999,7 @@ index 8cee3d2..b71f071 100644 unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ diff --git a/mx.c b/mx.c -index cc60517..07dba0c 100644 +index fcb781f..0a1a80e 100644 --- a/mx.c +++ b/mx.c @@ -30,6 +30,10 @@ @@ -1088,7 +1088,7 @@ index cc60517..07dba0c 100644 mx_fastclose_mailbox (ctx); return 0; -@@ -1361,6 +1396,11 @@ int mx_check_mailbox (CONTEXT *ctx, int *index_hint, int lock) +@@ -1362,6 +1397,11 @@ int mx_check_mailbox (CONTEXT *ctx, int *index_hint, int lock) { int rc; @@ -1127,14 +1127,13 @@ index 2d01add..3654ad1 100644 crypt.c cryptglue.c diff --git a/po/de.po b/po/de.po -index dd2dda5..75d56f3 100644 +index 19d5ec5..3f658dc 100644 --- a/po/de.po +++ b/po/de.po -@@ -5178,6 +5178,36 @@ msgstr "Extrahiere unterst +@@ -5273,6 +5273,35 @@ msgstr "Extrahiere unterst msgid "show S/MIME options" msgstr "Zeige S/MIME Optionen" -+ +#: compress.c:228 compress.c:253 +#, c-format +msgid "Decompressing %s...\n" @@ -1164,8 +1163,8 @@ index dd2dda5..75d56f3 100644 +msgid " %s: Error compressing mailbox! Uncompressed one kept!\n" +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n" + - #~ msgid "Clear" - #~ msgstr "Klartext" + #~ msgid "Warning: message has no From: header" + #~ msgstr "Warnung: Nachricht hat keine From: Kopfzeile" diff --git a/status.c b/status.c index 6051e3a..e8693c8 100644 diff --git a/correct_docdir_in_man_page.patch b/correct_docdir_in_man_page.patch index 2e7173190c5a..746a1d6b3e09 100644 --- a/correct_docdir_in_man_page.patch +++ b/correct_docdir_in_man_page.patch @@ -11,10 +11,10 @@ Gbp-Pq: Topic debian-specific 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/mutt.man b/doc/mutt.man -index 181ef62..718f87a 100644 +index b764c74..753953e 100644 --- a/doc/mutt.man +++ b/doc/mutt.man -@@ -185,7 +185,7 @@ User's personal mapping between MIME types and file extensions. +@@ -188,7 +188,7 @@ User's personal mapping between MIME types and file extensions. System mapping between MIME types and file extensions. .IP "@bindir@/mutt_dotlock" The privileged dotlocking program. diff --git a/define-pgp_getkeys_command.patch b/define-pgp_getkeys_command.patch index cfead7a18228..7877428d8a8d 100644 --- a/define-pgp_getkeys_command.patch +++ b/define-pgp_getkeys_command.patch @@ -10,10 +10,10 @@ Gbp-Pq: Topic misc 1 file changed, 2 insertions(+) diff --git a/contrib/gpg.rc b/contrib/gpg.rc -index d6c9def..7511f3c 100644 +index c713b6d..5b83cd5 100644 --- a/contrib/gpg.rc +++ b/contrib/gpg.rc -@@ -72,6 +72,8 @@ set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --l +@@ -72,6 +72,8 @@ set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --w # fetch keys # set pgp_getkeys_command="pkspxycwrap %r" diff --git a/document_debian_defaults.patch b/document_debian_defaults.patch index c7bb94ed6871..86daf6b4c1a9 100644 --- a/document_debian_defaults.patch +++ b/document_debian_defaults.patch @@ -11,7 +11,7 @@ Gbp-Pq: Topic debian-specific 1 file changed, 22 insertions(+) diff --git a/init.h b/init.h -index dc69e2c..7d319ad 100644 +index fd133dc..5e9244d 100644 --- a/init.h +++ b/init.h @@ -312,6 +312,9 @@ struct option_t MuttVars[] = { @@ -24,7 +24,7 @@ index dc69e2c..7d319ad 100644 */ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, /* -@@ -1044,6 +1047,9 @@ struct option_t MuttVars[] = { +@@ -1073,6 +1076,9 @@ struct option_t MuttVars[] = { ** one is not used. ** .pp ** Also see $$use_domain and $$hidden_host. @@ -34,7 +34,7 @@ index dc69e2c..7d319ad 100644 */ { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, /* -@@ -1577,6 +1583,9 @@ struct option_t MuttVars[] = { +@@ -1616,6 +1622,9 @@ struct option_t MuttVars[] = { ** system. It is used with various sets of parameters to gather the ** list of known remailers, and to finally send a message through the ** mixmaster chain. @@ -44,7 +44,7 @@ index dc69e2c..7d319ad 100644 */ #endif { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO }, -@@ -2619,6 +2628,10 @@ struct option_t MuttVars[] = { +@@ -2686,6 +2695,10 @@ struct option_t MuttVars[] = { ** This variable contains the name of either a directory, or a file which ** contains trusted certificates for use with OpenSSL. ** (S/MIME only) @@ -55,7 +55,7 @@ index dc69e2c..7d319ad 100644 */ { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 }, /* -@@ -2825,6 +2838,9 @@ struct option_t MuttVars[] = { +@@ -2891,6 +2904,9 @@ struct option_t MuttVars[] = { ** .ts ** set smtp_authenticators="digest-md5:cram-md5" ** .te @@ -65,7 +65,7 @@ index dc69e2c..7d319ad 100644 */ # endif /* USE_SASL */ { "smtp_pass", DT_STR, R_NONE, UL &SmtpPass, UL 0 }, -@@ -2872,6 +2888,9 @@ struct option_t MuttVars[] = { +@@ -2938,6 +2954,9 @@ struct option_t MuttVars[] = { ** .pp ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: ``\fCset sort=reverse-date-sent\fP''). @@ -75,7 +75,7 @@ index dc69e2c..7d319ad 100644 */ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS }, /* -@@ -3423,6 +3442,9 @@ struct option_t MuttVars[] = { +@@ -3522,6 +3541,9 @@ struct option_t MuttVars[] = { ** is set to deliver directly via SMTP (see $$smtp_url), this ** option does nothing: mutt will never write out the ``Bcc:'' header ** in this case. diff --git a/fix-configure-test-operator.patch b/fix-configure-test-operator.patch index 41ef5e51c5f4..e17e7091f826 100644 --- a/fix-configure-test-operator.patch +++ b/fix-configure-test-operator.patch @@ -8,14 +8,14 @@ Gbp-Pq: Topic misc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e7ebe01..2d57b76 100644 +index 5eed08f..1d260aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -1187,7 +1187,7 @@ if test "x$with_idn" != "xno"; then - ]) +@@ -1213,7 +1213,7 @@ if test "x$with_idn" != "xno"; then + LIBS="$mutt_save_LIBS" if test "$with_idn" != auto; then -- if test $have_stringprep_h = no || test $have_idna_h = no || test $ac_cv_search_STRINGPREP_CHECK_VERSION = no; then +- if test $have_stringprep_h = no || test $have_idna_h = no || test $ac_cv_search_stringprep_check_version = no; then + if test "$have_stringprep_h" = no || test "$have_idna_h" = no || test "$ac_cv_search_STRINGPREP_CHECK_VERSION" = no; then AC_MSG_ERROR([IDN was requested, but libidn was not usable on this system]) fi diff --git a/ifdef.patch b/ifdef.patch index 5527d3b100f1..1a760ef090ab 100644 --- a/ifdef.patch +++ b/ifdef.patch @@ -36,10 +36,10 @@ Gbp-Pq: Topic features 3 files changed, 83 insertions(+) diff --git a/doc/manual.xml.head b/doc/manual.xml.head -index 0093685..18ae918 100644 +index baeddac..8948459 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -4378,6 +4378,28 @@ from which to read input (e.g. <literal><command>source</command> +@@ -4411,6 +4411,28 @@ from which to read input (e.g. <literal><command>source</command> </sect1> @@ -69,7 +69,7 @@ index 0093685..18ae918 100644 <title>Removing Hooks</title> diff --git a/init.c b/init.c -index 4897b9e..cc3cf4b 100644 +index 118f06f..d95c9bc 100644 --- a/init.c +++ b/init.c @@ -601,6 +601,65 @@ static void remove_from_list (LIST **l, const char *str) @@ -139,10 +139,10 @@ index 4897b9e..cc3cf4b 100644 { do diff --git a/init.h b/init.h -index 395cd3f..80d05ce 100644 +index 569f91e..6b49341 100644 --- a/init.h +++ b/init.h -@@ -3487,6 +3487,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); +@@ -3596,6 +3596,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -150,7 +150,7 @@ index 395cd3f..80d05ce 100644 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -3537,6 +3538,7 @@ const struct command_t Commands[] = { +@@ -3646,6 +3647,7 @@ const struct command_t Commands[] = { { "group", parse_group, M_GROUP }, { "ungroup", parse_group, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, diff --git a/imap_fast_trash.patch b/imap_fast_trash.patch index f8f97b3b93a7..670f828edc7a 100644 --- a/imap_fast_trash.patch +++ b/imap_fast_trash.patch @@ -13,10 +13,10 @@ Gbp-Pq: Topic features 3 files changed, 65 insertions(+) diff --git a/imap/imap.c b/imap/imap.c -index 93dc06a..393d4ec 100644 +index ad15f5e..f476873 100644 --- a/imap/imap.c +++ b/imap/imap.c -@@ -886,6 +886,12 @@ static int imap_make_msg_set (IMAP_DATA* idata, BUFFER* buf, int flag, +@@ -885,6 +885,12 @@ static int imap_make_msg_set (IMAP_DATA* idata, BUFFER* buf, int flag, if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted) match = invert ^ hdrs[n]->deleted; break; @@ -29,7 +29,7 @@ index 93dc06a..393d4ec 100644 case M_FLAG: if (hdrs[n]->flagged != HEADER_DATA(hdrs[n])->flagged) match = invert ^ hdrs[n]->flagged; -@@ -2017,3 +2023,54 @@ int imap_complete(char* dest, size_t dlen, char* path) { +@@ -2026,3 +2032,54 @@ int imap_complete(char* dest, size_t dlen, char* path) { return -1; } @@ -97,7 +97,7 @@ index 74d7e13..99cd454 100644 + #endif diff --git a/mx.c b/mx.c -index 89b9431..cc60517 100644 +index 15c0a6b..fcb781f 100644 --- a/mx.c +++ b/mx.c @@ -802,6 +802,11 @@ static int trash_append (CONTEXT *ctx) diff --git a/multiple-fcc.patch b/multiple-fcc.patch index f3edff230bd7..25255aa1bbf6 100644 --- a/multiple-fcc.patch +++ b/multiple-fcc.patch @@ -16,10 +16,10 @@ Gbp-Pq: Topic mutt-patched 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/protos.h b/protos.h -index 38c8c01..551b142 100644 +index 799ac9b..5d2fafb 100644 --- a/protos.h +++ b/protos.h -@@ -362,6 +362,7 @@ int mutt_user_is_recipient (HEADER *); +@@ -364,6 +364,7 @@ int mutt_user_is_recipient (HEADER *); void mutt_update_num_postponed (void); int mutt_wait_filter (pid_t); int mutt_which_case (const char *); @@ -28,10 +28,10 @@ index 38c8c01..551b142 100644 int mutt_write_mime_body (BODY *, FILE *); int mutt_write_mime_header (BODY *, FILE *); diff --git a/send.c b/send.c -index 18b9390..893c859 100644 +index 6dd26c0..0b45171 100644 --- a/send.c +++ b/send.c -@@ -1747,7 +1747,7 @@ full_fcc: +@@ -1810,7 +1810,7 @@ full_fcc: * message was first postponed. */ msg->received = time (NULL); @@ -41,10 +41,10 @@ index 18b9390..893c859 100644 /* * Error writing FCC, we should abort sending. diff --git a/sendlib.c b/sendlib.c -index 0f05298..9d83401 100644 +index 689a112..2144156 100644 --- a/sendlib.c +++ b/sendlib.c -@@ -2680,6 +2680,36 @@ static void set_noconv_flags (BODY *b, short flag) +@@ -2687,6 +2687,36 @@ static void set_noconv_flags (BODY *b, short flag) } } diff --git a/nntp.patch b/nntp.patch index 0024aa8d5e9e..278691a834dd 100644 --- a/nntp.patch +++ b/nntp.patch @@ -469,10 +469,10 @@ index 0000000..70d1126 +* Fri Jan 28 2000 Vsevolod Volkov <vvv@mutt.kiev.ua> +- update to 1.1.2 diff --git a/Makefile.am b/Makefile.am -index 2fc6b1d..6d56156 100644 +index cf1ac98..20b4fad 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -58,6 +58,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \ +@@ -57,6 +57,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \ mutt_idna.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_ssl_gnutls.c \ mutt_tunnel.c pgp.c pgpinvoke.c pgpkey.c pgplib.c pgpmicalg.c \ pgppacket.c pop.c pop_auth.c pop_lib.c remailer.c resize.c sha1.c \ @@ -480,7 +480,7 @@ index 2fc6b1d..6d56156 100644 smime.c smtp.c utf8.c wcwidth.c \ bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h -@@ -69,6 +70,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ +@@ -68,6 +69,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ mx.h pager.h pgp.h pop.h protos.h rfc1524.h rfc2047.h \ rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \ @@ -489,7 +489,7 @@ index 2fc6b1d..6d56156 100644 mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h \ README.SSL smime.h group.h \ diff --git a/OPS b/OPS -index 1ed9c96..b900373 100644 +index 3ffb82a..62db4b4 100644 --- a/OPS +++ b/OPS @@ -8,14 +8,16 @@ OP_BOUNCE_MESSAGE "remail a message to another user" @@ -1329,10 +1329,10 @@ index 515d69f..ad89ab2 100644 }; diff --git a/buffy.c b/buffy.c -index 225104d..b1abfa9 100644 +index 90ca6db..bd026df 100644 --- a/buffy.c +++ b/buffy.c -@@ -525,6 +525,9 @@ int mutt_buffy_check (int force) +@@ -543,6 +543,9 @@ int mutt_buffy_check (int force) /* check device ID and serial number instead of comparing paths */ if (!Context || Context->magic == M_IMAP || Context->magic == M_POP @@ -1342,7 +1342,7 @@ index 225104d..b1abfa9 100644 || stat (Context->path, &contex_sb) != 0) { contex_sb.st_dev=0; -@@ -541,6 +544,11 @@ int mutt_buffy_check (int force) +@@ -559,6 +562,11 @@ int mutt_buffy_check (int force) tmp->magic = M_POP; else #endif @@ -1354,7 +1354,7 @@ index 225104d..b1abfa9 100644 if (stat (tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) || (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0)) { -@@ -556,7 +564,11 @@ int mutt_buffy_check (int force) +@@ -574,7 +582,11 @@ int mutt_buffy_check (int force) /* check to see if the folder is the currently selected folder * before polling */ if (!Context || !Context->path || @@ -1452,7 +1452,7 @@ index d0ee4af..8dc48cd 100644 if (*s == '=' || *s == '+' || *s == '!') { diff --git a/compose.c b/compose.c -index 16576f2..9e23dfd 100644 +index 0fa6df2..901ffc0 100644 --- a/compose.c +++ b/compose.c @@ -33,11 +33,16 @@ @@ -1538,7 +1538,7 @@ index 16576f2..9e23dfd 100644 if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) { -@@ -149,10 +183,11 @@ static void redraw_crypt_lines (HEADER *msg) +@@ -152,10 +186,11 @@ static void redraw_crypt_lines (HEADER *msg) if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP) && (msg->security & SIGN)) printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>")); @@ -1551,7 +1551,7 @@ index 16576f2..9e23dfd 100644 } if ((WithCrypto & APPLICATION_SMIME) -@@ -173,7 +208,7 @@ static void redraw_mix_line (LIST *chain) +@@ -176,7 +211,7 @@ static void redraw_mix_line (LIST *chain) int c; char *t; @@ -1560,7 +1560,7 @@ index 16576f2..9e23dfd 100644 if (!chain) { -@@ -248,9 +283,28 @@ static void draw_envelope (HEADER *msg, char *fcc) +@@ -251,9 +286,28 @@ static void draw_envelope (HEADER *msg, char *fcc) { draw_sidebar (MENU_COMPOSE); draw_envelope_addr (HDR_FROM, msg->env->from); @@ -1589,7 +1589,7 @@ index 16576f2..9e23dfd 100644 mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); mutt_paddstr (W, NONULL (msg->env->subject)); draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); -@@ -501,6 +555,12 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -504,6 +558,12 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ /* Sort, SortAux could be changed in mutt_index_menu() */ int oldSort, oldSortAux; struct stat st; @@ -1602,7 +1602,7 @@ index 16576f2..9e23dfd 100644 mutt_attach_init (msg->content); idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1); -@@ -511,10 +571,18 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -514,10 +574,18 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->make_entry = snd_entry; menu->tag = mutt_tag_attach; menu->data = idx; @@ -1621,7 +1621,7 @@ index 16576f2..9e23dfd 100644 switch (op = mutt_menuLoop (menu)) { case OP_REDRAW: -@@ -527,17 +595,90 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -530,6 +598,10 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_TO: @@ -1630,6 +1630,9 @@ index 16576f2..9e23dfd 100644 + break; +#endif menu->redraw = edit_address_list (HDR_TO, &msg->env->to); + if (option (OPTCRYPTOPPORTUNISTICENCRYPT)) + { +@@ -539,6 +611,10 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_BCC: @@ -1638,6 +1641,9 @@ index 16576f2..9e23dfd 100644 + break; +#endif menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc); + if (option (OPTCRYPTOPPORTUNISTICENCRYPT)) + { +@@ -548,6 +624,10 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_CC: @@ -1646,6 +1652,10 @@ index 16576f2..9e23dfd 100644 + break; +#endif menu->redraw = edit_address_list (HDR_CC, &msg->env->cc); + if (option (OPTCRYPTOPPORTUNISTICENCRYPT)) + { +@@ -556,6 +636,67 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ + } mutt_message_hook (NULL, msg, M_SEND2HOOK); break; +#ifdef USE_NNTP @@ -1712,7 +1722,7 @@ index 16576f2..9e23dfd 100644 case OP_COMPOSE_EDIT_SUBJECT: if (msg->env->subject) strfcpy (buf, msg->env->subject, sizeof (buf)); -@@ -701,6 +842,9 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -721,6 +862,9 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ break; case OP_COMPOSE_ATTACH_MESSAGE: @@ -1722,7 +1732,7 @@ index 16576f2..9e23dfd 100644 { char *prompt; HEADER *h; -@@ -708,7 +852,22 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -728,7 +872,22 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ fname[0] = 0; prompt = _("Open mailbox to attach message from"); @@ -1745,7 +1755,7 @@ index 16576f2..9e23dfd 100644 { strfcpy (fname, NONULL (Context->path), sizeof (fname)); mutt_pretty_mailbox (fname, sizeof (fname)); -@@ -717,6 +876,11 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -737,6 +896,11 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0]) break; @@ -1757,7 +1767,7 @@ index 16576f2..9e23dfd 100644 mutt_expand_path (fname, sizeof (fname)); #ifdef USE_IMAP if (!mx_is_imap (fname)) -@@ -724,6 +888,9 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -744,6 +908,9 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ #ifdef USE_POP if (!mx_is_pop (fname)) #endif @@ -1768,10 +1778,10 @@ index 16576f2..9e23dfd 100644 if (access (fname, R_OK) == -1) { diff --git a/configure.ac b/configure.ac -index 2d57b76..86bd542 100644 +index 1d260aa..d17abaa 100644 --- a/configure.ac +++ b/configure.ac -@@ -592,6 +592,15 @@ AC_ARG_ENABLE(imap, AS_HELP_STRING([--enable-imap],[Enable IMAP support]), +@@ -600,6 +600,15 @@ AC_ARG_ENABLE(imap, AS_HELP_STRING([--enable-imap],[Enable IMAP support]), ]) AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes) @@ -1787,7 +1797,7 @@ index 2d57b76..86bd542 100644 AC_ARG_ENABLE(smtp, AS_HELP_STRING([--enable-smtp],[include internal SMTP relay support]), [if test $enableval = yes; then AC_DEFINE(USE_SMTP, 1, [Include internal SMTP relay support]) -@@ -599,7 +608,7 @@ AC_ARG_ENABLE(smtp, AS_HELP_STRING([--enable-smtp],[include internal SMTP relay +@@ -607,7 +616,7 @@ AC_ARG_ENABLE(smtp, AS_HELP_STRING([--enable-smtp],[include internal SMTP relay need_socket="yes" fi]) @@ -1797,7 +1807,7 @@ index 2d57b76..86bd542 100644 fi diff --git a/curs_main.c b/curs_main.c -index 5c58f1c..8cec507 100644 +index 2e35f90..d052c38 100644 --- a/curs_main.c +++ b/curs_main.c @@ -22,6 +22,7 @@ @@ -1819,7 +1829,7 @@ index 5c58f1c..8cec507 100644 #include <ctype.h> #include <stdlib.h> -@@ -428,12 +433,27 @@ static const struct mapping_t IndexHelp[] = { +@@ -492,12 +497,27 @@ static const struct mapping_t IndexHelp[] = { { NULL, 0 } }; @@ -1847,7 +1857,7 @@ index 5c58f1c..8cec507 100644 int op = OP_NULL; int done = 0; /* controls when to exit the "event" loop */ int i = 0, j; -@@ -454,7 +474,11 @@ int mutt_index_menu (void) +@@ -518,7 +538,11 @@ int mutt_index_menu (void) menu->make_entry = index_make_entry; menu->color = index_color; menu->current = ci_first_message (); @@ -1860,7 +1870,7 @@ index 5c58f1c..8cec507 100644 if (!attach_msg) mutt_buffy_check(1); /* force the buffy check after we enter the folder */ -@@ -710,6 +734,9 @@ int mutt_index_menu (void) +@@ -774,6 +798,9 @@ int mutt_index_menu (void) mutt_curs_set (1); /* fallback from the pager */ } @@ -1870,7 +1880,7 @@ index 5c58f1c..8cec507 100644 switch (op) { -@@ -760,6 +787,161 @@ int mutt_index_menu (void) +@@ -824,6 +851,161 @@ int mutt_index_menu (void) menu_current_bottom (menu); break; @@ -2032,7 +2042,7 @@ index 5c58f1c..8cec507 100644 case OP_JUMP: CHECK_MSGCOUNT; -@@ -856,11 +1038,33 @@ int mutt_index_menu (void) +@@ -920,11 +1102,33 @@ int mutt_index_menu (void) break; case OP_MAIN_LIMIT: @@ -2067,7 +2077,7 @@ index 5c58f1c..8cec507 100644 { if (menu->oldcurrent >= 0) { -@@ -1103,15 +1307,22 @@ int mutt_index_menu (void) +@@ -1167,15 +1371,22 @@ int mutt_index_menu (void) case OP_SIDEBAR_OPEN: case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: @@ -2097,7 +2107,7 @@ index 5c58f1c..8cec507 100644 cp = _("Open mailbox in read-only mode"); else cp = _("Open mailbox"); -@@ -1130,6 +1341,22 @@ int mutt_index_menu (void) +@@ -1194,6 +1405,22 @@ int mutt_index_menu (void) } else { @@ -2120,7 +2130,7 @@ index 5c58f1c..8cec507 100644 mutt_buffy (buf, sizeof (buf)); if ( op == OP_SIDEBAR_OPEN ) { -@@ -1153,6 +1380,14 @@ int mutt_index_menu (void) +@@ -1217,6 +1444,14 @@ int mutt_index_menu (void) } } @@ -2135,7 +2145,7 @@ index 5c58f1c..8cec507 100644 mutt_expand_path (buf, sizeof (buf)); set_curbuffy(buf); if (mx_get_magic (buf) <= 0) -@@ -1200,15 +1435,18 @@ int mutt_index_menu (void) +@@ -1264,15 +1499,18 @@ int mutt_index_menu (void) CurrentMenu = MENU_MAIN; mutt_folder_hook (buf); @@ -2157,7 +2167,7 @@ index 5c58f1c..8cec507 100644 mutt_clear_error (); mutt_buffy_check(1); /* force the buffy check after we have changed the folder */ -@@ -1277,6 +1515,7 @@ int mutt_index_menu (void) +@@ -1341,6 +1579,7 @@ int mutt_index_menu (void) CHECK_MSGCOUNT; CHECK_VISIBLE; CHECK_READONLY; @@ -2165,7 +2175,7 @@ index 5c58f1c..8cec507 100644 if ((Sort & SORT_MASK) != SORT_THREADS) mutt_error _("Threading is not enabled."); -@@ -1311,7 +1550,7 @@ int mutt_index_menu (void) +@@ -1375,7 +1614,7 @@ int mutt_index_menu (void) CHECK_MSGCOUNT; CHECK_VISIBLE; CHECK_READONLY; @@ -2174,7 +2184,7 @@ index 5c58f1c..8cec507 100644 if ((Sort & SORT_MASK) != SORT_THREADS) mutt_error _("Threading is not enabled."); -@@ -1932,6 +2171,20 @@ int mutt_index_menu (void) +@@ -1996,6 +2235,20 @@ int mutt_index_menu (void) } break; @@ -2195,7 +2205,7 @@ index 5c58f1c..8cec507 100644 case OP_DISPLAY_ADDRESS: CHECK_MSGCOUNT; -@@ -2136,6 +2389,39 @@ int mutt_index_menu (void) +@@ -2200,6 +2453,39 @@ int mutt_index_menu (void) menu->redraw = REDRAW_FULL; break; @@ -2236,7 +2246,7 @@ index 5c58f1c..8cec507 100644 CHECK_ATTACH; diff --git a/doc/Muttrc b/doc/Muttrc -index bf0e6d0..e03da88 100644 +index d1a96a2..7fdc12f 100644 --- a/doc/Muttrc +++ b/doc/Muttrc @@ -240,6 +240,28 @@ attachments -I message/external-body @@ -2286,7 +2296,7 @@ index bf0e6d0..e03da88 100644 # set certificate_file="~/.mutt_certificates" # # Name: certificate_file -@@ -1131,6 +1164,19 @@ attachments -I message/external-body +@@ -1170,6 +1203,19 @@ attachments -I message/external-body # of the same email for you. # # @@ -2306,7 +2316,7 @@ index bf0e6d0..e03da88 100644 # set force_name=no # # Name: force_name -@@ -1241,6 +1287,27 @@ attachments -I message/external-body +@@ -1280,6 +1326,27 @@ attachments -I message/external-body # ``Franklin'' to ``Franklin, Steve''. # # @@ -2334,7 +2344,7 @@ index bf0e6d0..e03da88 100644 # set hdrs=yes # # Name: hdrs -@@ -1789,6 +1856,7 @@ attachments -I message/external-body +@@ -1828,6 +1895,7 @@ attachments -I message/external-body # %E number of messages in current thread # %f sender (address + real name), either From: or Return-Path: # %F author name, or recipient name if the message is from you @@ -2342,7 +2352,7 @@ index bf0e6d0..e03da88 100644 # %H spam attribute(s) of this message # %i message-id of the current message # %l number of lines in the message (does not work with maildir, -@@ -1804,12 +1872,14 @@ attachments -I message/external-body +@@ -1843,12 +1911,14 @@ attachments -I message/external-body # stashed the message: list name or recipient name # if not sent to a list # %P progress indicator for the built-in pager (how much of the file has been displayed) @@ -2357,7 +2367,7 @@ index bf0e6d0..e03da88 100644 # %X number of attachments # (please see the ``attachments'' section for possible speed effects) # %y ``X-Label:'' field, if present -@@ -1845,6 +1915,27 @@ attachments -I message/external-body +@@ -1884,6 +1954,27 @@ attachments -I message/external-body # ``save-hook'', ``fcc-hook'' and ``fcc-save-hook'', too. # # @@ -2385,7 +2395,7 @@ index bf0e6d0..e03da88 100644 # set ispell="ispell" # # Name: ispell -@@ -2214,6 +2305,18 @@ attachments -I message/external-body +@@ -2268,6 +2359,18 @@ attachments -I message/external-body # be attached to the newly composed message if this option is set. # # @@ -2404,7 +2414,7 @@ index bf0e6d0..e03da88 100644 # set mix_entry_format="%4n %c %-16s %a" # # Name: mix_entry_format -@@ -2280,6 +2383,144 @@ attachments -I message/external-body +@@ -2334,6 +2437,144 @@ attachments -I message/external-body # See also $read_inc, $write_inc and $net_inc. # # @@ -2549,7 +2559,7 @@ index bf0e6d0..e03da88 100644 # set pager="builtin" # # Name: pager -@@ -2997,6 +3238,19 @@ attachments -I message/external-body +@@ -3064,6 +3305,19 @@ attachments -I message/external-body # string after the inclusion of a message which is being replied to. # # @@ -2569,7 +2579,7 @@ index bf0e6d0..e03da88 100644 # set postpone=ask-yes # # Name: postpone -@@ -3605,6 +3859,41 @@ attachments -I message/external-body +@@ -3697,6 +3951,41 @@ attachments -I message/external-body # shell from /etc/passwd is used. # # @@ -2611,7 +2621,7 @@ index bf0e6d0..e03da88 100644 # set sig_dashes=yes # # Name: sig_dashes -@@ -4851,3 +5140,14 @@ attachments -I message/external-body +@@ -4995,3 +5284,14 @@ attachments -I message/external-body # ``tuning'' section of the manual for performance considerations. # # @@ -2627,10 +2637,10 @@ index bf0e6d0..e03da88 100644 +# +# diff --git a/doc/manual.xml.head b/doc/manual.xml.head -index 4366758..5b523ce 100644 +index f7a9387..aeefa5c 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -1694,6 +1694,26 @@ See also the <link linkend="postpone">$postpone</link> quad-option. +@@ -1696,6 +1696,26 @@ See also the <link linkend="postpone">$postpone</link> quad-option. </sect1> @@ -2658,7 +2668,7 @@ index 4366758..5b523ce 100644 <chapter id="configuration"> diff --git a/doc/mutt.man b/doc/mutt.man -index 718f87a..c4f44d1 100644 +index 753953e..0e61ae2 100644 --- a/doc/mutt.man +++ b/doc/mutt.man @@ -23,8 +23,8 @@ mutt \- The Mutt Mail User Agent @@ -2684,7 +2694,7 @@ index 718f87a..c4f44d1 100644 Display help. .IP "-H \fIdraft\fP" diff --git a/functions.h b/functions.h -index 363b4d5..66f3345 100644 +index 1485080..8ca5411 100644 --- a/functions.h +++ b/functions.h @@ -88,6 +88,10 @@ const struct binding_t OpMain[] = { /* map: index */ @@ -2745,7 +2755,7 @@ index 363b4d5..66f3345 100644 { "extract-keys", OP_EXTRACT_KEYS, "\013" }, -@@ -186,6 +205,10 @@ const struct binding_t OpPager[] = { /* map: pager */ +@@ -187,6 +206,10 @@ const struct binding_t OpPager[] = { /* map: pager */ { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" }, { "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" }, @@ -2756,7 +2766,7 @@ index 363b4d5..66f3345 100644 { "next-unread-mailbox", OP_MAIN_NEXT_UNREAD_MAILBOX, NULL }, { "copy-message", OP_COPY_MESSAGE, "C" }, { "decode-copy", OP_DECODE_COPY, "\033C" }, -@@ -196,8 +219,12 @@ const struct binding_t OpPager[] = { /* map: pager */ +@@ -197,8 +220,12 @@ const struct binding_t OpPager[] = { /* map: pager */ { "clear-flag", OP_MAIN_CLEAR_FLAG, "W" }, { "edit", OP_EDIT_MESSAGE, "e" }, { "edit-type", OP_EDIT_TYPE, "\005" }, @@ -2770,7 +2780,7 @@ index 363b4d5..66f3345 100644 { "group-reply", OP_GROUP_REPLY, "g" }, #ifdef USE_IMAP { "imap-fetch-mail", OP_MAIN_IMAP_FETCH, NULL }, -@@ -219,6 +246,9 @@ const struct binding_t OpPager[] = { /* map: pager */ +@@ -220,6 +247,9 @@ const struct binding_t OpPager[] = { /* map: pager */ { "sort-mailbox", OP_SORT, "o" }, { "sort-reverse", OP_SORT_REVERSE, "O" }, { "print-message", OP_PRINT, "p" }, @@ -2780,7 +2790,7 @@ index 363b4d5..66f3345 100644 { "previous-thread", OP_MAIN_PREV_THREAD, "\020" }, { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" }, { "purge-message", OP_PURGE_MESSAGE, NULL }, -@@ -267,7 +297,7 @@ const struct binding_t OpPager[] = { /* map: pager */ +@@ -268,7 +298,7 @@ const struct binding_t OpPager[] = { /* map: pager */ { "half-down", OP_HALF_DOWN, NULL }, { "previous-line", OP_PREV_LINE, NULL }, { "bottom", OP_PAGER_BOTTOM, NULL }, @@ -2789,7 +2799,7 @@ index 363b4d5..66f3345 100644 -@@ -295,6 +325,10 @@ const struct binding_t OpAttach[] = { /* map: attachment */ +@@ -297,6 +327,10 @@ const struct binding_t OpAttach[] = { /* map: attachment */ { "bounce-message", OP_BOUNCE_MESSAGE, "b" }, { "display-toggle-weed", OP_DISPLAY_HEADERS, "h" }, { "edit-type", OP_EDIT_TYPE, "\005" }, @@ -2800,7 +2810,7 @@ index 363b4d5..66f3345 100644 { "print-entry", OP_PRINT, "p" }, { "save-entry", OP_SAVE, "s" }, { "pipe-entry", OP_PIPE, "|" }, -@@ -320,6 +354,7 @@ const struct binding_t OpAttach[] = { /* map: attachment */ +@@ -322,6 +356,7 @@ const struct binding_t OpAttach[] = { /* map: attachment */ const struct binding_t OpCompose[] = { /* map: compose */ { "attach-file", OP_COMPOSE_ATTACH_FILE, "a" }, { "attach-message", OP_COMPOSE_ATTACH_MESSAGE, "A" }, @@ -2808,7 +2818,7 @@ index 363b4d5..66f3345 100644 { "edit-bcc", OP_COMPOSE_EDIT_BCC, "b" }, { "edit-cc", OP_COMPOSE_EDIT_CC, "c" }, { "copy-file", OP_SAVE, "C" }, -@@ -339,6 +374,11 @@ const struct binding_t OpCompose[] = { /* map: compose */ +@@ -341,6 +376,11 @@ const struct binding_t OpCompose[] = { /* map: compose */ { "print-entry", OP_PRINT, "l" }, { "edit-mime", OP_COMPOSE_EDIT_MIME, "m" }, { "new-mime", OP_COMPOSE_NEW_MIME, "n" }, @@ -2820,7 +2830,7 @@ index 363b4d5..66f3345 100644 { "postpone-message", OP_COMPOSE_POSTPONE_MESSAGE, "P" }, { "edit-reply-to", OP_COMPOSE_EDIT_REPLY_TO, "r" }, { "rename-file", OP_COMPOSE_RENAME_FILE, "R" }, -@@ -390,14 +430,25 @@ const struct binding_t OpBrowser[] = { /* map: browser */ +@@ -392,14 +432,25 @@ const struct binding_t OpBrowser[] = { /* map: browser */ { "select-new", OP_BROWSER_NEW_FILE, "N" }, { "check-new", OP_CHECK_NEW, NULL }, { "toggle-mailboxes", OP_TOGGLE_MAILBOXES, "\t" }, @@ -2847,7 +2857,7 @@ index 363b4d5..66f3345 100644 #endif { NULL, 0, NULL } diff --git a/globals.h b/globals.h -index 61765a4..0529f94 100644 +index 602f932..814eb05 100644 --- a/globals.h +++ b/globals.h @@ -95,6 +95,17 @@ WHERE char *MixEntryFormat; @@ -2868,7 +2878,7 @@ index 61765a4..0529f94 100644 WHERE char *Outbox; WHERE char *Pager; WHERE char *PagerFmt; -@@ -193,6 +204,11 @@ extern unsigned char QuadOptions[]; +@@ -196,6 +207,11 @@ extern unsigned char QuadOptions[]; WHERE unsigned short Counter INITVAL (0); @@ -2968,7 +2978,7 @@ index fb77d0c..9e7df82 100644 void hash_delete_hash (HASH * table, int hash, const char *key, const void *data, void (*destroy) (void *)); diff --git a/hcache.c b/hcache.c -index af17932..555e1d1 100644 +index 561dce3..d4f33b5 100644 --- a/hcache.c +++ b/hcache.c @@ -447,6 +447,12 @@ dump_envelope(ENVELOPE * e, unsigned char *d, int *off, int convert) @@ -3082,10 +3092,10 @@ index f701c8e..e817dad 100644 (!n->in_reply_to || mutt_strcmp (n->in_reply_to->data, msg->env->in_reply_to->data) != 0)) diff --git a/init.c b/init.c -index 20a66bd..6ab1020 100644 +index d82772c..3de1f1f 100644 --- a/init.c +++ b/init.c -@@ -3104,6 +3104,28 @@ void mutt_init (int skip_sys_rc, LIST *commands) +@@ -3082,6 +3082,28 @@ void mutt_init (int skip_sys_rc, LIST *commands) else Fqdn = safe_strdup(NONULL(Hostname)); @@ -3115,7 +3125,7 @@ index 20a66bd..6ab1020 100644 Spoolfile = safe_strdup (p); else if ((p = getenv ("MAILDIR"))) diff --git a/init.h b/init.h -index e20a24e..6efadb2 100644 +index a5d4238..b9cd406 100644 --- a/init.h +++ b/init.h @@ -176,6 +176,20 @@ struct option_t MuttVars[] = { @@ -3154,7 +3164,7 @@ index e20a24e..6efadb2 100644 #if defined(USE_SSL) { "certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates" }, /* -@@ -815,6 +837,16 @@ struct option_t MuttVars[] = { +@@ -844,6 +866,16 @@ struct option_t MuttVars[] = { ** sent to both the list and your address, resulting in two copies ** of the same email for you. */ @@ -3171,7 +3181,7 @@ index e20a24e..6efadb2 100644 { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 }, /* ** .pp -@@ -897,6 +929,26 @@ struct option_t MuttVars[] = { +@@ -926,6 +958,26 @@ struct option_t MuttVars[] = { ** a regular expression that will match the whole name so mutt will expand ** ``Franklin'' to ``Franklin, Steve''. */ @@ -3198,7 +3208,7 @@ index e20a24e..6efadb2 100644 { "hdr_format", DT_SYN, R_NONE, UL "index_format", 0 }, /* */ -@@ -1278,6 +1330,7 @@ struct option_t MuttVars[] = { +@@ -1307,6 +1359,7 @@ struct option_t MuttVars[] = { ** .dt %E .dd number of messages in current thread ** .dt %f .dd sender (address + real name), either From: or Return-Path: ** .dt %F .dd author name, or recipient name if the message is from you @@ -3206,7 +3216,7 @@ index e20a24e..6efadb2 100644 ** .dt %H .dd spam attribute(s) of this message ** .dt %i .dd message-id of the current message ** .dt %l .dd number of lines in the message (does not work with maildir, -@@ -1293,12 +1346,14 @@ struct option_t MuttVars[] = { +@@ -1322,12 +1375,14 @@ struct option_t MuttVars[] = { ** stashed the message: list name or recipient name ** if not sent to a list ** .dt %P .dd progress indicator for the built-in pager (how much of the file has been displayed) @@ -3221,7 +3231,7 @@ index e20a24e..6efadb2 100644 ** .dt %X .dd number of attachments ** (please see the ``$attachments'' section for possible speed effects) ** .dt %y .dd ``X-Label:'' field, if present -@@ -1333,6 +1388,25 @@ struct option_t MuttVars[] = { +@@ -1362,6 +1417,25 @@ struct option_t MuttVars[] = { ** Note that these expandos are supported in ** ``$save-hook'', ``$fcc-hook'' and ``$fcc-save-hook'', too. */ @@ -3247,7 +3257,7 @@ index e20a24e..6efadb2 100644 { "ispell", DT_PATH, R_NONE, UL &Ispell, UL ISPELL }, /* ** .pp -@@ -1567,6 +1641,15 @@ struct option_t MuttVars[] = { +@@ -1606,6 +1680,15 @@ struct option_t MuttVars[] = { ** menu, attachments which cannot be decoded in a reasonable manner will ** be attached to the newly composed message if this option is \fIset\fP. */ @@ -3263,7 +3273,7 @@ index e20a24e..6efadb2 100644 #ifdef MIXMASTER { "mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, UL "%4n %c %-16s %a" }, /* -@@ -1617,6 +1700,100 @@ struct option_t MuttVars[] = { +@@ -1656,6 +1739,100 @@ struct option_t MuttVars[] = { ** See also $$read_inc, $$write_inc and $$net_inc. */ #endif @@ -3364,7 +3374,7 @@ index e20a24e..6efadb2 100644 { "pager", DT_PATH, R_NONE, UL &Pager, UL "builtin" }, /* ** .pp -@@ -2152,6 +2329,16 @@ struct option_t MuttVars[] = { +@@ -2204,6 +2381,16 @@ struct option_t MuttVars[] = { { "post_indent_str", DT_SYN, R_NONE, UL "post_indent_string", 0 }, /* */ @@ -3381,7 +3391,7 @@ index e20a24e..6efadb2 100644 { "postpone", DT_QUAD, R_NONE, OPT_POSTPONE, M_ASKYES }, /* ** .pp -@@ -2576,6 +2763,28 @@ struct option_t MuttVars[] = { +@@ -2643,6 +2830,28 @@ struct option_t MuttVars[] = { ** Command to use when spawning a subshell. By default, the user's login ** shell from \fC/etc/passwd\fP is used. */ @@ -3410,9 +3420,9 @@ index e20a24e..6efadb2 100644 { "sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, 1 }, /* ** .pp -@@ -3511,6 +3720,14 @@ struct option_t MuttVars[] = { - ** xterm_set_titles has been set. This string is identical in formatting - ** to the one used by ``$$status_format''. +@@ -3598,6 +3807,14 @@ struct option_t MuttVars[] = { + {"xterm_set_titles", DT_SYN, R_NONE, UL "ts_enabled", 0 }, + /* */ +#ifdef USE_NNTP + { "x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0 }, @@ -3426,10 +3436,10 @@ index e20a24e..6efadb2 100644 { NULL, 0, 0, 0, 0 } }; diff --git a/keymap.c b/keymap.c -index 9dc87f0..5cdef30 100644 +index 1710b17..9d90807 100644 --- a/keymap.c +++ b/keymap.c -@@ -784,7 +784,6 @@ void km_init (void) +@@ -786,7 +786,6 @@ void km_init (void) km_bindkey ("<enter>", MENU_MAIN, OP_DISPLAY_MESSAGE); km_bindkey ("x", MENU_PAGER, OP_EXIT); @@ -3438,10 +3448,10 @@ index 9dc87f0..5cdef30 100644 km_bindkey ("<pagedown>", MENU_PAGER, OP_NEXT_PAGE); km_bindkey ("<pageup>", MENU_PAGER, OP_PREV_PAGE); diff --git a/mailbox.h b/mailbox.h -index b652628..ed7954c 100644 +index 000503d..9052e46 100644 --- a/mailbox.h +++ b/mailbox.h -@@ -75,6 +75,9 @@ int mx_is_imap (const char *); +@@ -77,6 +77,9 @@ int mx_is_imap (const char *); #ifdef USE_POP int mx_is_pop (const char *); #endif @@ -3452,7 +3462,7 @@ index b652628..ed7954c 100644 int mx_access (const char*, int); int mx_check_empty (const char *); diff --git a/main.c b/main.c -index 5ab1868..a291397 100644 +index e71bc9b..01a8121 100644 --- a/main.c +++ b/main.c @@ -62,6 +62,10 @@ @@ -3531,7 +3541,7 @@ index 5ab1868..a291397 100644 case 'z': flags |= M_IGNORE; break; -@@ -1014,6 +1047,18 @@ int main (int argc, char **argv) +@@ -1025,6 +1058,18 @@ int main (int argc, char **argv) } else if (flags & M_SELECT) { @@ -3550,7 +3560,7 @@ index 5ab1868..a291397 100644 if (!Incoming) { mutt_endwin _("No incoming mailboxes defined."); exit (1); -@@ -1029,6 +1074,15 @@ int main (int argc, char **argv) +@@ -1040,6 +1085,15 @@ int main (int argc, char **argv) if (!folder[0]) strfcpy (folder, NONULL(Spoolfile), sizeof (folder)); @@ -3567,7 +3577,7 @@ index 5ab1868..a291397 100644 mutt_str_replace (&CurrentFolder, folder); diff --git a/mutt.h b/mutt.h -index 932ef10..a95b249 100644 +index d73e514..1ee1583 100644 --- a/mutt.h +++ b/mutt.h @@ -239,6 +239,9 @@ enum @@ -3609,7 +3619,7 @@ index 932ef10..a95b249 100644 OPTATTACHSPLIT, OPTAUTOEDIT, OPTAUTOTAG, -@@ -410,6 +421,9 @@ enum +@@ -411,6 +422,9 @@ enum OPTMETOO, OPTMHPURGE, OPTMIMEFORWDECODE, @@ -3619,7 +3629,7 @@ index 932ef10..a95b249 100644 OPTNARROWTREE, OPTPAGERSTOP, OPTPIPEDECODE, -@@ -495,6 +509,16 @@ enum +@@ -499,6 +513,16 @@ enum OPTPGPAUTOINLINE, OPTPGPREPLYINLINE, @@ -3636,7 +3646,7 @@ index 932ef10..a95b249 100644 /* pseudo options */ OPTAUXSORT, /* (pseudo) using auxiliary sort function */ -@@ -515,6 +539,7 @@ enum +@@ -519,6 +543,7 @@ enum OPTSORTSUBTHREADS, /* (pseudo) used when $sort_aux changes */ OPTNEEDRESCORE, /* (pseudo) set when the `score' command is used */ OPTATTACHMSG, /* (pseudo) used by attach-message */ @@ -3644,7 +3654,7 @@ index 932ef10..a95b249 100644 OPTKEEPQUIET, /* (pseudo) shut up the message and refresh * functions while we are executing an * external program. -@@ -527,6 +552,11 @@ enum +@@ -531,6 +556,11 @@ enum OPTSIDEBARNEWMAILONLY, @@ -3656,7 +3666,7 @@ index 932ef10..a95b249 100644 OPTMAX }; -@@ -606,6 +636,13 @@ typedef struct envelope +@@ -610,6 +640,13 @@ typedef struct envelope char *supersedes; char *date; char *x_label; @@ -3670,7 +3680,7 @@ index 932ef10..a95b249 100644 BUFFER *spam; LIST *references; /* message references (in reverse order) */ LIST *in_reply_to; /* in-reply-to header content */ -@@ -792,7 +829,7 @@ typedef struct header +@@ -796,7 +833,7 @@ typedef struct header int refno; /* message number on server */ #endif @@ -3680,10 +3690,10 @@ index 932ef10..a95b249 100644 #endif diff --git a/mutt_sasl.c b/mutt_sasl.c -index 896825e..21da012 100644 +index 7d7388c..0ba4f4e 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c -@@ -188,6 +188,11 @@ int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn) +@@ -190,6 +190,11 @@ int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn) case M_ACCT_TYPE_SMTP: service = "smtp"; break; @@ -3696,10 +3706,10 @@ index 896825e..21da012 100644 mutt_error (_("Unknown SASL profile")); return -1; diff --git a/muttlib.c b/muttlib.c -index 9086f07..49389fc 100644 +index 039e7c3..cc3a681 100644 --- a/muttlib.c +++ b/muttlib.c -@@ -337,7 +337,7 @@ void mutt_free_header (HEADER **h) +@@ -329,7 +329,7 @@ void mutt_free_header (HEADER **h) #ifdef MIXMASTER mutt_free_list (&(*h)->chain); #endif @@ -3708,7 +3718,7 @@ index 9086f07..49389fc 100644 FREE (&(*h)->data); #endif FREE (h); /* __FREE_CHECKED__ */ -@@ -725,6 +725,13 @@ void mutt_free_envelope (ENVELOPE **p) +@@ -717,6 +717,13 @@ void mutt_free_envelope (ENVELOPE **p) FREE (&(*p)->supersedes); FREE (&(*p)->date); FREE (&(*p)->x_label); @@ -3722,7 +3732,7 @@ index 9086f07..49389fc 100644 mutt_buffer_free (&(*p)->spam); -@@ -1573,6 +1580,14 @@ int mutt_save_confirm (const char *s, struct stat *st) +@@ -1568,6 +1575,14 @@ int mutt_save_confirm (const char *s, struct stat *st) } } @@ -3738,7 +3748,7 @@ index 9086f07..49389fc 100644 { if (magic == -1) diff --git a/mx.c b/mx.c -index cbee47d..5bbbf2a 100644 +index e80b8ff..b2ac0b7 100644 --- a/mx.c +++ b/mx.c @@ -347,6 +347,22 @@ int mx_is_pop (const char *p) @@ -3841,7 +3851,7 @@ index cbee47d..5bbbf2a 100644 if (read_msgs && quadoption (OPT_MOVE) != M_NO) { char *p; -@@ -1464,6 +1522,11 @@ int mx_check_mailbox (CONTEXT *ctx, int *index_hint, int lock) +@@ -1465,6 +1523,11 @@ int mx_check_mailbox (CONTEXT *ctx, int *index_hint, int lock) case M_POP: return (pop_check_mailbox (ctx, index_hint)); #endif /* USE_POP */ @@ -3853,7 +3863,7 @@ index cbee47d..5bbbf2a 100644 } } -@@ -1524,6 +1587,15 @@ MESSAGE *mx_open_message (CONTEXT *ctx, int msgno) +@@ -1525,6 +1588,15 @@ MESSAGE *mx_open_message (CONTEXT *ctx, int msgno) } #endif /* USE_POP */ @@ -3869,7 +3879,7 @@ index cbee47d..5bbbf2a 100644 default: dprint (1, (debugfile, "mx_open_message(): function not implemented for mailbox type %d.\n", ctx->magic)); FREE (&msg); -@@ -1599,6 +1671,9 @@ int mx_close_message (MESSAGE **msg) +@@ -1600,6 +1672,9 @@ int mx_close_message (MESSAGE **msg) int r = 0; if ((*msg)->magic == M_MH || (*msg)->magic == M_MAILDIR @@ -7743,7 +7753,7 @@ index 0000000..c937034 + +#endif /* _NNTP_H_ */ diff --git a/pager.c b/pager.c -index d372fc0..e888452 100644 +index 696e55c..8e38e38 100644 --- a/pager.c +++ b/pager.c @@ -1085,6 +1085,11 @@ fill_buffer (FILE *f, LOFF_T *last_pos, LOFF_T offset, unsigned char **buf, @@ -7996,7 +8006,7 @@ index 3654ad1..1e499ec 100644 parse.c pattern.c diff --git a/postpone.c b/postpone.c -index 21e96e6..5144be9 100644 +index 7a4cbb1..569edb6 100644 --- a/postpone.c +++ b/postpone.c @@ -125,15 +125,26 @@ int mutt_num_postponed (int force) @@ -8027,7 +8037,7 @@ index 21e96e6..5144be9 100644 return (PostCount); diff --git a/protos.h b/protos.h -index 551b142..bb44d34 100644 +index 5d2fafb..81d09db 100644 --- a/protos.h +++ b/protos.h @@ -111,6 +111,7 @@ HASH *mutt_make_id_hash (CONTEXT *); @@ -8039,10 +8049,10 @@ index 551b142..bb44d34 100644 char *mutt_read_rfc822_line (FILE *, char *, size_t *); ENVELOPE *mutt_read_rfc822_header (FILE *, HEADER *, short, short); diff --git a/recvattach.c b/recvattach.c -index 31dfcad..05a1cde 100644 +index fddbc2f..b76a4ea 100644 --- a/recvattach.c +++ b/recvattach.c -@@ -1119,6 +1119,15 @@ void mutt_view_attachments (HEADER *hdr) +@@ -1120,6 +1120,15 @@ void mutt_view_attachments (HEADER *hdr) } #endif @@ -8055,10 +8065,10 @@ index 31dfcad..05a1cde 100644 + } +#endif + - if (WithCrypto && hdr->security & ~PGP_TRADITIONAL_CHECKED) + if (WithCrypto && (hdr->security & ENCRYPT)) { - mutt_message _( -@@ -1210,10 +1219,33 @@ void mutt_view_attachments (HEADER *hdr) + mutt_message _( +@@ -1214,10 +1223,33 @@ void mutt_view_attachments (HEADER *hdr) case OP_FORWARD_MESSAGE: CHECK_ATTACH; mutt_attach_forward (fp, hdr, idx, idxlen, @@ -8222,7 +8232,7 @@ index a6a3a91..e633119 100644 { nattach = count_tagged (idx, idxlen); diff --git a/send.c b/send.c -index 893c859..13358b9 100644 +index 0b45171..f4a3611 100644 --- a/send.c +++ b/send.c @@ -44,6 +44,11 @@ @@ -8397,7 +8407,7 @@ index 893c859..13358b9 100644 if (SmtpUrl) return mutt_smtp_send (msg->env->from, msg->env->to, msg->env->cc, msg->env->bcc, tempfile, -@@ -1137,6 +1226,13 @@ ci_send_message (int flags, /* send mode */ +@@ -1159,6 +1248,13 @@ ci_send_message (int flags, /* send mode */ int rv = -1; @@ -8411,7 +8421,7 @@ index 893c859..13358b9 100644 if (!flags && !msg && quadoption (OPT_RECALL) != M_NO && mutt_num_postponed (1)) { -@@ -1167,6 +1263,22 @@ ci_send_message (int flags, /* send mode */ +@@ -1194,6 +1290,22 @@ ci_send_message (int flags, /* send mode */ { if ((flags = mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0) goto cleanup; @@ -8434,7 +8444,7 @@ index 893c859..13358b9 100644 } if (flags & (SENDPOSTPONED|SENDRESEND)) -@@ -1259,11 +1371,16 @@ ci_send_message (int flags, /* send mode */ +@@ -1286,11 +1398,16 @@ ci_send_message (int flags, /* send mode */ if (flags & SENDREPLY) mutt_fix_reply_recipients (msg->env); @@ -8452,7 +8462,7 @@ index 893c859..13358b9 100644 goto cleanup; } -@@ -1546,6 +1663,11 @@ main_loop: +@@ -1587,6 +1704,11 @@ main_loop: if (i == -1) { /* abort */ @@ -8464,7 +8474,7 @@ index 893c859..13358b9 100644 mutt_message _("Mail not sent."); goto cleanup; } -@@ -1578,6 +1700,9 @@ main_loop: +@@ -1641,6 +1763,9 @@ main_loop: } } @@ -8474,7 +8484,7 @@ index 893c859..13358b9 100644 if (!has_recips (msg->env->to) && !has_recips (msg->env->cc) && !has_recips (msg->env->bcc)) { -@@ -1611,6 +1736,19 @@ main_loop: +@@ -1674,6 +1799,19 @@ main_loop: mutt_error _("No subject specified."); goto main_loop; } @@ -8494,7 +8504,7 @@ index 893c859..13358b9 100644 if (msg->content->next) msg->content = mutt_make_multipart (msg->content); -@@ -1817,7 +1955,12 @@ full_fcc: +@@ -1880,7 +2018,12 @@ full_fcc: } } else if (!option (OPTNOCURSES) && ! (flags & SENDMAILX)) @@ -8509,7 +8519,7 @@ index 893c859..13358b9 100644 if (WithCrypto && (msg->security & ENCRYPT)) FREE (&pgpkeylist); diff --git a/sendlib.c b/sendlib.c -index 9d83401..46fc511 100644 +index 2144156..cddbe32 100644 --- a/sendlib.c +++ b/sendlib.c @@ -46,6 +46,10 @@ @@ -8552,7 +8562,7 @@ index 9d83401..46fc511 100644 fputc ('\n', f); } -@@ -1962,6 +1976,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, +@@ -1969,6 +1983,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, mutt_write_address_list (env->to, fp, 4, 0); } else if (mode > 0) @@ -8562,7 +8572,7 @@ index 9d83401..46fc511 100644 fputs ("To: \n", fp); if (env->cc) -@@ -1970,6 +1987,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, +@@ -1977,6 +1994,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, mutt_write_address_list (env->cc, fp, 4, 0); } else if (mode > 0) @@ -8572,7 +8582,7 @@ index 9d83401..46fc511 100644 fputs ("Cc: \n", fp); if (env->bcc && should_write_bcc) -@@ -1981,8 +2001,28 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, +@@ -1988,8 +2008,28 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, } } else if (mode > 0) @@ -8601,7 +8611,7 @@ index 9d83401..46fc511 100644 if (env->subject) mutt_write_one_header (fp, "Subject", env->subject, NULL, 0, 0); else if (mode == 1) -@@ -2001,6 +2041,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, +@@ -2008,6 +2048,9 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, fputs ("Reply-To: \n", fp); if (env->mail_followup_to) @@ -8611,7 +8621,7 @@ index 9d83401..46fc511 100644 { fputs ("Mail-Followup-To: ", fp); mutt_write_address_list (env->mail_followup_to, fp, 18, 0); -@@ -2344,6 +2387,23 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ +@@ -2351,6 +2394,23 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ size_t argslen = 0, argsmax = 0; int i; @@ -8635,7 +8645,7 @@ index 9d83401..46fc511 100644 /* ensure that $sendmail is set to avoid a crash. http://dev.mutt.org/trac/ticket/3548 */ if (!s) { -@@ -2374,6 +2434,10 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ +@@ -2381,6 +2441,10 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ i++; } @@ -8646,7 +8656,7 @@ index 9d83401..46fc511 100644 if (eightbit && option (OPTUSE8BITMIME)) args = add_option (args, &argslen, &argsmax, "-B8BITMIME"); -@@ -2405,6 +2469,9 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ +@@ -2412,6 +2476,9 @@ mutt_invoke_sendmail (ADDRESS *from, /* the sender */ args = add_args (args, &argslen, &argsmax, to); args = add_args (args, &argslen, &argsmax, cc); args = add_args (args, &argslen, &argsmax, bcc); @@ -8656,7 +8666,7 @@ index 9d83401..46fc511 100644 if (argslen == argsmax) safe_realloc (&args, sizeof (char *) * (++argsmax)); -@@ -2485,6 +2552,9 @@ void mutt_prepare_envelope (ENVELOPE *env, int final) +@@ -2492,6 +2559,9 @@ void mutt_prepare_envelope (ENVELOPE *env, int final) rfc2047_encode_string (&env->x_label); if (env->subject) @@ -8666,7 +8676,7 @@ index 9d83401..46fc511 100644 { rfc2047_encode_string (&env->subject); } -@@ -2605,6 +2675,10 @@ int mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to) +@@ -2612,6 +2682,10 @@ int mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to) } rfc822_write_address (resent_from, sizeof (resent_from), from, 0); diff --git a/patch-1.5.4.vk.pgp_verbose_mime.patch b/patch-1.5.4.vk.pgp_verbose_mime.patch index dec798aece2b..8e0ddb872c4b 100644 --- a/patch-1.5.4.vk.pgp_verbose_mime.patch +++ b/patch-1.5.4.vk.pgp_verbose_mime.patch @@ -9,14 +9,14 @@ Gbp-Pq: Topic features-old --- globals.h | 2 ++ init.h | 12 ++++++++++++ - pgp.c | 2 ++ - 3 files changed, 16 insertions(+) + pgp.c | 3 ++- + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/globals.h b/globals.h -index a7e2304..5b6e56a 100644 +index 6a1b8da..282fde3 100644 --- a/globals.h +++ b/globals.h -@@ -244,6 +244,8 @@ WHERE char *PgpVerifyKeyCommand; +@@ -247,6 +247,8 @@ WHERE char *PgpVerifyKeyCommand; WHERE char *PgpListSecringCommand; WHERE char *PgpListPubringCommand; WHERE char *PgpGetkeysCommand; @@ -26,10 +26,10 @@ index a7e2304..5b6e56a 100644 /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey; diff --git a/init.h b/init.h -index d4a882b..a64992a 100644 +index 1fba2f2..e3bcc89 100644 --- a/init.h +++ b/init.h -@@ -2590,6 +2590,18 @@ struct option_t MuttVars[] = { +@@ -2657,6 +2657,18 @@ struct option_t MuttVars[] = { ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -49,13 +49,14 @@ index d4a882b..a64992a 100644 diff --git a/pgp.c b/pgp.c -index 506a078..92dee8c 100644 +index 9c03db7..497ff06 100644 --- a/pgp.c +++ b/pgp.c -@@ -1127,6 +1127,8 @@ BODY *pgp_sign_message (BODY *a) +@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a) t->disposition = DISPNONE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ +- mutt_set_parameter ("name", "signature.asc", &t->parameter); + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); + t->description = safe_strdup (PgpMimeSignatureDescription); diff --git a/purge-message.patch b/purge-message.patch index a9061299a01d..a042dd03c678 100644 --- a/purge-message.patch +++ b/purge-message.patch @@ -53,10 +53,10 @@ index 8414a8b..02cea8e 100644 OP_QUERY_APPEND "append new query results to current results" OP_QUIT "save changes to mailbox and quit" diff --git a/curs_main.c b/curs_main.c -index 16ddbc9..d266708 100644 +index 8553102..1de79f3 100644 --- a/curs_main.c +++ b/curs_main.c -@@ -1844,6 +1844,7 @@ int mutt_index_menu (void) +@@ -1908,6 +1908,7 @@ int mutt_index_menu (void) MAYBE_REDRAW (menu->redraw); break; @@ -64,7 +64,7 @@ index 16ddbc9..d266708 100644 case OP_DELETE: CHECK_MSGCOUNT; -@@ -1854,6 +1855,7 @@ int mutt_index_menu (void) +@@ -1918,6 +1919,7 @@ int mutt_index_menu (void) if (tag) { mutt_tag_set_flag (M_DELETE, 1); @@ -72,7 +72,7 @@ index 16ddbc9..d266708 100644 if (option (OPTDELETEUNTAG)) mutt_tag_set_flag (M_TAG, 0); menu->redraw = REDRAW_INDEX; -@@ -1861,6 +1863,8 @@ int mutt_index_menu (void) +@@ -1925,6 +1927,8 @@ int mutt_index_menu (void) else { mutt_set_flag (Context, CURHDR, M_DELETE, 1); @@ -81,7 +81,7 @@ index 16ddbc9..d266708 100644 if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, CURHDR, M_TAG, 0); if (option (OPTRESOLVE)) -@@ -2162,11 +2166,13 @@ int mutt_index_menu (void) +@@ -2226,11 +2230,13 @@ int mutt_index_menu (void) if (tag) { mutt_tag_set_flag (M_DELETE, 0); @@ -95,7 +95,7 @@ index 16ddbc9..d266708 100644 if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) { menu->current++; -@@ -2187,9 +2193,11 @@ int mutt_index_menu (void) +@@ -2251,9 +2257,11 @@ int mutt_index_menu (void) CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0, @@ -151,7 +151,7 @@ index 7a1c5a9..a29388c 100644 { "exit", OP_EXIT, "q" }, { "reply", OP_REPLY, "r" }, diff --git a/mutt.h b/mutt.h -index 0b879b9..8cee3d2 100644 +index 29bb6c2..ef41afd 100644 --- a/mutt.h +++ b/mutt.h @@ -186,6 +186,7 @@ enum @@ -162,7 +162,7 @@ index 0b879b9..8cee3d2 100644 M_FLAG, M_TAG, M_UNTAG, -@@ -711,6 +712,7 @@ typedef struct header +@@ -715,6 +716,7 @@ typedef struct header unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; unsigned int appended : 1; /* has been saved */ @@ -171,7 +171,7 @@ index 0b879b9..8cee3d2 100644 unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ diff --git a/mx.c b/mx.c -index f7fd01f..89b9431 100644 +index c0a6d30..15c0a6b 100644 --- a/mx.c +++ b/mx.c @@ -806,6 +806,7 @@ static int trash_append (CONTEXT *ctx) @@ -183,7 +183,7 @@ index f7fd01f..89b9431 100644 { mx_close_mailbox (ctx_trash, NULL); diff --git a/pager.c b/pager.c -index 23eb8ca..b17afb4 100644 +index 4f7e7be..0994274 100644 --- a/pager.c +++ b/pager.c @@ -2350,12 +2350,15 @@ search_next: diff --git a/sidebar-compose.patch b/sidebar-compose.patch index ed12fe93ee55..90d815b841d7 100644 --- a/sidebar-compose.patch +++ b/sidebar-compose.patch @@ -19,7 +19,7 @@ Gbp-Pq: Topic mutt-patched 1 file changed, 2 insertions(+) diff --git a/compose.c b/compose.c -index 5a14d70..16576f2 100644 +index b63695f..0fa6df2 100644 --- a/compose.c +++ b/compose.c @@ -32,6 +32,7 @@ @@ -30,7 +30,7 @@ index 5a14d70..16576f2 100644 #ifdef MIXMASTER #include "remailer.h" -@@ -245,6 +246,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr) +@@ -248,6 +249,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr) static void draw_envelope (HEADER *msg, char *fcc) { diff --git a/sidebar-dotpathsep.patch b/sidebar-dotpathsep.patch index 5649ca4bdb21..315fa1649bcf 100644 --- a/sidebar-dotpathsep.patch +++ b/sidebar-dotpathsep.patch @@ -17,10 +17,10 @@ Gbp-Pq: Topic mutt-patched 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/globals.h b/globals.h -index 3f83328..61765a4 100644 +index 004c795..602f932 100644 --- a/globals.h +++ b/globals.h -@@ -118,6 +118,7 @@ WHERE char *SendCharset; +@@ -119,6 +119,7 @@ WHERE char *SendCharset; WHERE char *Sendmail; WHERE char *Shell; WHERE char *SidebarDelim; @@ -29,10 +29,10 @@ index 3f83328..61765a4 100644 WHERE char *SimpleSearch; #if USE_SMTP diff --git a/init.h b/init.h -index 502f570..b0784d8 100644 +index c664e5f..166671b 100644 --- a/init.h +++ b/init.h -@@ -2001,6 +2001,14 @@ struct option_t MuttVars[] = { +@@ -2051,6 +2051,14 @@ struct option_t MuttVars[] = { ** .pp ** The width of the sidebar. */ diff --git a/sidebar-new.patch b/sidebar-new.patch index ab17b6c936cf..fb2653463611 100644 --- a/sidebar-new.patch +++ b/sidebar-new.patch @@ -1,7 +1,7 @@ -From ed547aeb2c6f10da3639e5212b47f4e3aea450d6 Mon Sep 17 00:00:00 2001 +From 355399bde98203af59d20821f9e840fc056bd383 Mon Sep 17 00:00:00 2001 From: Julius Haertl <jus@bitgrid.net> Date: Tue, 9 Sep 2014 22:31:49 +0200 -Subject: [PATCH] Patch for sidebar iteration functionality +Subject: Patch for sidebar iteration functionality sidebar-new will move the selected folder to the next with new messages. If the end is reached, it will start at the top. @@ -19,19 +19,19 @@ Useful macros would be: 5 files changed, 15 insertions(+) diff --git a/OPS b/OPS -index b900373..62db4b4 100644 +index 1ed9c96..3ffb82a 100644 --- a/OPS +++ b/OPS -@@ -206,3 +206,4 @@ OP_SIDEBAR_PREV "go to previous mailbox" +@@ -187,3 +187,4 @@ OP_SIDEBAR_PREV "go to previous mailbox" OP_SIDEBAR_OPEN "open hilighted mailbox" OP_SIDEBAR_NEXT_NEW "go down to next mailbox with new mail" OP_SIDEBAR_PREV_NEW "go to previous mailbox with new mail" +OP_SIDEBAR_NEW "iterate though mailboxes with new mail" diff --git a/curs_main.c b/curs_main.c -index 8cec507..fb0a74f 100644 +index acb106d..2e35f90 100644 --- a/curs_main.c +++ b/curs_main.c -@@ -2550,6 +2550,7 @@ int mutt_index_menu (void) +@@ -2328,6 +2328,7 @@ int mutt_index_menu (void) case OP_SIDEBAR_PREV: case OP_SIDEBAR_NEXT_NEW: case OP_SIDEBAR_PREV_NEW: @@ -40,10 +40,10 @@ index 8cec507..fb0a74f 100644 break; default: diff --git a/functions.h b/functions.h -index 66f3345..8ca5411 100644 +index 363b4d5..1485080 100644 --- a/functions.h +++ b/functions.h -@@ -195,6 +195,7 @@ const struct binding_t OpMain[] = { /* map: index */ +@@ -176,6 +176,7 @@ const struct binding_t OpMain[] = { /* map: index */ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL}, { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL}, @@ -51,7 +51,7 @@ index 66f3345..8ca5411 100644 { "sidebar-open", OP_SIDEBAR_OPEN, NULL }, { NULL, 0, NULL } }; -@@ -317,6 +318,7 @@ const struct binding_t OpPager[] = { /* map: pager */ +@@ -287,6 +288,7 @@ const struct binding_t OpPager[] = { /* map: pager */ { "sidebar-prev", OP_SIDEBAR_PREV, NULL }, { "sidebar-next-new", OP_SIDEBAR_NEXT_NEW, NULL}, { "sidebar-prev-new", OP_SIDEBAR_PREV_NEW, NULL}, @@ -60,10 +60,10 @@ index 66f3345..8ca5411 100644 { NULL, 0, NULL } }; diff --git a/pager.c b/pager.c -index e888452..9a7d076 100644 +index 8d64fe1..696e55c 100644 --- a/pager.c +++ b/pager.c -@@ -2868,6 +2868,7 @@ search_next: +@@ -2791,6 +2791,7 @@ search_next: case OP_SIDEBAR_PREV: case OP_SIDEBAR_NEXT_NEW: case OP_SIDEBAR_PREV_NEW: @@ -93,5 +93,5 @@ index c3ea338..eb8ecd2 100644 return; } -- -2.1.0 +2.6.0.rc0.2.g7662973.dirty diff --git a/sidebar-newonly.patch b/sidebar-newonly.patch index f9ff91e4ffd2..d206848026b6 100644 --- a/sidebar-newonly.patch +++ b/sidebar-newonly.patch @@ -28,10 +28,10 @@ index b036db9..1ed9c96 100644 +OP_SIDEBAR_NEXT_NEW "go down to next mailbox with new mail" +OP_SIDEBAR_PREV_NEW "go to previous mailbox with new mail" diff --git a/curs_main.c b/curs_main.c -index 7b81798..5c58f1c 100644 +index ea530a6..acb106d 100644 --- a/curs_main.c +++ b/curs_main.c -@@ -2262,6 +2262,8 @@ int mutt_index_menu (void) +@@ -2326,6 +2326,8 @@ int mutt_index_menu (void) case OP_SIDEBAR_SCROLL_DOWN: case OP_SIDEBAR_NEXT: case OP_SIDEBAR_PREV: @@ -63,10 +63,10 @@ index ef8937a..363b4d5 100644 { NULL, 0, NULL } }; diff --git a/init.h b/init.h -index b0784d8..e20a24e 100644 +index 166671b..a5d4238 100644 --- a/init.h +++ b/init.h -@@ -2009,6 +2009,11 @@ struct option_t MuttVars[] = { +@@ -2059,6 +2059,11 @@ struct option_t MuttVars[] = { ** you're not using IMAP folders, you probably prefer setting this to "/" ** alone. */ @@ -79,10 +79,10 @@ index b0784d8..e20a24e 100644 /* ** .pp diff --git a/mutt.h b/mutt.h -index 61a9612..932ef10 100644 +index 5f25406..d73e514 100644 --- a/mutt.h +++ b/mutt.h -@@ -525,6 +525,8 @@ enum +@@ -529,6 +529,8 @@ enum OPTDONTHANDLEPGPKEYS, /* (pseudo) used to extract PGP keys */ OPTUNBUFFEREDINPUT, /* (pseudo) don't use key buffer */ @@ -92,7 +92,7 @@ index 61a9612..932ef10 100644 }; diff --git a/pager.c b/pager.c -index 469efe4..d372fc0 100644 +index 5cfcb75..8d64fe1 100644 --- a/pager.c +++ b/pager.c @@ -2789,6 +2789,8 @@ search_next: diff --git a/sidebar.patch b/sidebar.patch index 350ecc727754..262e8f98a65a 100644 --- a/sidebar.patch +++ b/sidebar.patch @@ -42,7 +42,7 @@ Gbp-Pq: Topic mutt-patched --- Makefile.am | 1 + OPS | 5 + - buffy.c | 123 +++++++++++++++++++++ + buffy.c | 124 +++++++++++++++++++++ buffy.h | 4 + color.c | 2 + compose.c | 26 ++--- @@ -65,15 +65,15 @@ Gbp-Pq: Topic mutt-patched pager.c | 30 ++++-- sidebar.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sidebar.h | 36 +++++++ - 25 files changed, 719 insertions(+), 34 deletions(-) + 25 files changed, 720 insertions(+), 34 deletions(-) create mode 100644 sidebar.c create mode 100644 sidebar.h diff --git a/Makefile.am b/Makefile.am -index 09dd64b..2fc6b1d 100644 +index 5dfeff6..cf1ac98 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -32,6 +32,7 @@ mutt_SOURCES = \ +@@ -33,6 +33,7 @@ mutt_SOURCES = \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ @@ -95,7 +95,7 @@ index 02cea8e..b036db9 100644 +OP_SIDEBAR_PREV "go to previous mailbox" +OP_SIDEBAR_OPEN "open hilighted mailbox" diff --git a/buffy.c b/buffy.c -index e5a0f79..225104d 100644 +index 12a16d1..90ca6db 100644 --- a/buffy.c +++ b/buffy.c @@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat *st) @@ -156,10 +156,11 @@ index e5a0f79..225104d 100644 return 0; } -@@ -340,6 +384,68 @@ static int buffy_maildir_hasnew (BUFFY* mailbox) - return rc; - } +@@ -357,6 +401,69 @@ static int buffy_maildir_hasnew (BUFFY* mailbox) + return 0; + } ++ +/* update message counts for the sidebar */ +void buffy_maildir_update (BUFFY* mailbox) +{ @@ -225,7 +226,7 @@ index e5a0f79..225104d 100644 /* returns 1 if mailbox has new mail */ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) { -@@ -371,6 +477,20 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) +@@ -388,6 +495,20 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) return rc; } @@ -246,7 +247,7 @@ index e5a0f79..225104d 100644 int mutt_buffy_check (int force) { BUFFY *tmp; -@@ -444,16 +564,19 @@ int mutt_buffy_check (int force) +@@ -461,16 +582,19 @@ int mutt_buffy_check (int force) { case M_MBOX: case M_MMDF: @@ -283,20 +284,20 @@ index f9fc55a..672d178 100644 short magic; /* mailbox type */ short newly_created; /* mbox or mmdf just popped into existence */ diff --git a/color.c b/color.c -index ef97ca9..2112132 100644 +index 64a46dc..d6f9198 100644 --- a/color.c +++ b/color.c -@@ -93,6 +93,8 @@ static const struct mapping_t Fields[] = - { "bold", MT_COLOR_BOLD }, +@@ -94,6 +94,8 @@ static const struct mapping_t Fields[] = { "underline", MT_COLOR_UNDERLINE }, { "index", MT_COLOR_INDEX }, + { "prompt", MT_COLOR_PROMPT }, + { "sidebar_new", MT_COLOR_NEW }, + { "sidebar_flagged", MT_COLOR_FLAGGED }, { NULL, 0 } }; diff --git a/compose.c b/compose.c -index 9cfa2d4..5a14d70 100644 +index 9d87060..b63695f 100644 --- a/compose.c +++ b/compose.c @@ -72,7 +72,7 @@ enum @@ -317,8 +318,8 @@ index 9cfa2d4..5a14d70 100644 if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) { -@@ -142,7 +142,7 @@ static void redraw_crypt_lines (HEADER *msg) - } +@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER *msg) + addstr (_(" (OppEnc mode)")); clrtoeol (); - move (HDR_CRYPTINFO, 0); @@ -326,7 +327,7 @@ index 9cfa2d4..5a14d70 100644 clrtoeol (); if ((WithCrypto & APPLICATION_PGP) -@@ -159,7 +159,7 @@ static void redraw_crypt_lines (HEADER *msg) +@@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER *msg) && (msg->security & ENCRYPT) && SmimeCryptAlg && *SmimeCryptAlg) { @@ -335,7 +336,7 @@ index 9cfa2d4..5a14d70 100644 NONULL(SmimeCryptAlg)); } } -@@ -172,7 +172,7 @@ static void redraw_mix_line (LIST *chain) +@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain) int c; char *t; @@ -344,7 +345,7 @@ index 9cfa2d4..5a14d70 100644 if (!chain) { -@@ -187,7 +187,7 @@ static void redraw_mix_line (LIST *chain) +@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain) if (t && t[0] == '0' && t[1] == '\0') t = "<random>"; @@ -353,7 +354,7 @@ index 9cfa2d4..5a14d70 100644 break; addstr (NONULL(t)); -@@ -239,7 +239,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr) +@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr) buf[0] = 0; rfc822_write_address (buf, sizeof (buf), addr, 1); @@ -362,7 +363,7 @@ index 9cfa2d4..5a14d70 100644 mutt_paddstr (W, buf); } -@@ -249,10 +249,10 @@ static void draw_envelope (HEADER *msg, char *fcc) +@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, char *fcc) draw_envelope_addr (HDR_TO, msg->env->to); draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_BCC, msg->env->bcc); @@ -375,7 +376,7 @@ index 9cfa2d4..5a14d70 100644 mutt_paddstr (W, fcc); if (WithCrypto) -@@ -263,7 +263,7 @@ static void draw_envelope (HEADER *msg, char *fcc) +@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, char *fcc) #endif SETCOLOR (MT_COLOR_STATUS); @@ -384,7 +385,7 @@ index 9cfa2d4..5a14d70 100644 clrtoeol (); NORMAL_COLOR; -@@ -299,7 +299,7 @@ static int edit_address_list (int line, ADDRESS **addr) +@@ -302,7 +302,7 @@ static int edit_address_list (int line, ADDRESS **addr) /* redraw the expanded list so the user can see the result */ buf[0] = 0; rfc822_write_address (buf, sizeof (buf), *addr, 1); @@ -393,7 +394,7 @@ index 9cfa2d4..5a14d70 100644 mutt_paddstr (W, buf); return 0; -@@ -544,7 +544,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { mutt_str_replace (&msg->env->subject, buf); @@ -402,7 +403,7 @@ index 9cfa2d4..5a14d70 100644 if (msg->env->subject) mutt_paddstr (W, msg->env->subject); else -@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ +@@ -580,7 +580,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ { strfcpy (fcc, buf, fcclen); mutt_pretty_mailbox (fcc, fcclen); @@ -412,7 +413,7 @@ index 9cfa2d4..5a14d70 100644 fccSet = 1; } diff --git a/curs_main.c b/curs_main.c -index e7f11bd..7b81798 100644 +index 9d718ee..ea530a6 100644 --- a/curs_main.c +++ b/curs_main.c @@ -26,7 +26,9 @@ @@ -425,7 +426,7 @@ index e7f11bd..7b81798 100644 #ifdef USE_POP #include "pop.h" -@@ -532,8 +534,12 @@ int mutt_index_menu (void) +@@ -596,8 +598,12 @@ int mutt_index_menu (void) menu->redraw |= REDRAW_STATUS; if (do_buffy_notify) { @@ -440,7 +441,7 @@ index e7f11bd..7b81798 100644 } else do_buffy_notify = 1; -@@ -545,6 +551,7 @@ int mutt_index_menu (void) +@@ -609,6 +615,7 @@ int mutt_index_menu (void) if (menu->redraw & REDRAW_FULL) { menu_redraw_full (menu); @@ -448,7 +449,7 @@ index e7f11bd..7b81798 100644 mutt_show_error (); } -@@ -567,9 +574,12 @@ int mutt_index_menu (void) +@@ -631,9 +638,12 @@ int mutt_index_menu (void) if (menu->redraw & REDRAW_STATUS) { @@ -461,7 +462,7 @@ index e7f11bd..7b81798 100644 mutt_paddstr (COLS, buf); NORMAL_COLOR; menu->redraw &= ~REDRAW_STATUS; -@@ -589,7 +599,7 @@ int mutt_index_menu (void) +@@ -653,7 +663,7 @@ int mutt_index_menu (void) menu->oldcurrent = -1; if (option (OPTARROWCURSOR)) @@ -470,7 +471,7 @@ index e7f11bd..7b81798 100644 else if (option (OPTBRAILLEFRIENDLY)) move (menu->current - menu->top + menu->offset, 0); else -@@ -1090,6 +1100,7 @@ int mutt_index_menu (void) +@@ -1154,6 +1164,7 @@ int mutt_index_menu (void) menu->redraw = REDRAW_FULL; break; @@ -478,7 +479,7 @@ index e7f11bd..7b81798 100644 case OP_MAIN_CHANGE_FOLDER: case OP_MAIN_NEXT_UNREAD_MAILBOX: -@@ -1121,7 +1132,11 @@ int mutt_index_menu (void) +@@ -1185,7 +1196,11 @@ int mutt_index_menu (void) { mutt_buffy (buf, sizeof (buf)); @@ -491,7 +492,7 @@ index e7f11bd..7b81798 100644 { if (menu->menu == MENU_PAGER) { -@@ -1139,6 +1154,7 @@ int mutt_index_menu (void) +@@ -1203,6 +1218,7 @@ int mutt_index_menu (void) } mutt_expand_path (buf, sizeof (buf)); @@ -499,7 +500,7 @@ index e7f11bd..7b81798 100644 if (mx_get_magic (buf) <= 0) { mutt_error (_("%s is not a mailbox."), buf); -@@ -2242,6 +2258,12 @@ int mutt_index_menu (void) +@@ -2306,6 +2322,12 @@ int mutt_index_menu (void) mutt_what_key(); break; @@ -564,10 +565,10 @@ index 26171a0..ef8937a 100644 }; diff --git a/globals.h b/globals.h -index 5b6e56a..3f83328 100644 +index 282fde3..004c795 100644 --- a/globals.h +++ b/globals.h -@@ -117,6 +117,7 @@ WHERE short SearchContext; +@@ -118,6 +118,7 @@ WHERE short SearchContext; WHERE char *SendCharset; WHERE char *Sendmail; WHERE char *Shell; @@ -575,7 +576,7 @@ index 5b6e56a..3f83328 100644 WHERE char *Signature; WHERE char *SimpleSearch; #if USE_SMTP -@@ -211,6 +212,9 @@ WHERE short ScoreThresholdDelete; +@@ -214,6 +215,9 @@ WHERE short ScoreThresholdDelete; WHERE short ScoreThresholdRead; WHERE short ScoreThresholdFlag; @@ -604,10 +605,10 @@ index 32f8417..d68e3ab 100644 return; } diff --git a/imap/imap.c b/imap/imap.c -index 393d4ec..4b1ec86 100644 +index f476873..af3ac3d 100644 --- a/imap/imap.c +++ b/imap/imap.c -@@ -1520,7 +1520,7 @@ int imap_buffy_check (int force) +@@ -1529,7 +1529,7 @@ int imap_buffy_check (int force) imap_munge_mbox_name (munged, sizeof (munged), name); snprintf (command, sizeof (command), @@ -617,10 +618,10 @@ index 393d4ec..4b1ec86 100644 if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0) { diff --git a/init.h b/init.h -index 08e004c..502f570 100644 +index 35224c1..c664e5f 100644 --- a/init.h +++ b/init.h -@@ -1980,6 +1980,27 @@ struct option_t MuttVars[] = { +@@ -2030,6 +2030,27 @@ struct option_t MuttVars[] = { ** not used. ** (PGP only) */ @@ -649,7 +650,7 @@ index 08e004c..502f570 100644 /* ** .pp diff --git a/mailbox.h b/mailbox.h -index 91e5dc7..b652628 100644 +index 2b2c9a1..000503d 100644 --- a/mailbox.h +++ b/mailbox.h @@ -27,6 +27,7 @@ @@ -659,7 +660,7 @@ index 91e5dc7..b652628 100644 +#define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */ /* mx_open_new_message() */ - #define M_ADD_FROM 1 /* add a From_ line */ + #define M_ADD_FROM (1<<0) /* add a From_ line */ diff --git a/mbox.c b/mbox.c index 6d3b6bd..fa82eb3 100644 --- a/mbox.c @@ -780,7 +781,7 @@ index 27b5f8e..bc3a02f 100644 move (menu->current - menu->top + menu->offset, 0); else diff --git a/mh.c b/mh.c -index 21e6491..48a16fb 100644 +index 63e12d2..4a84a99 100644 --- a/mh.c +++ b/mh.c @@ -295,6 +295,28 @@ void mh_buffy(BUFFY *b) @@ -813,10 +814,10 @@ index 21e6491..48a16fb 100644 { int fd; diff --git a/mutt.h b/mutt.h -index 4db92a6..61a9612 100644 +index 01d47de..5f25406 100644 --- a/mutt.h +++ b/mutt.h -@@ -433,6 +433,8 @@ enum +@@ -435,6 +435,8 @@ enum OPTSAVEEMPTY, OPTSAVENAME, OPTSCORE, @@ -825,7 +826,7 @@ index 4db92a6..61a9612 100644 OPTSIGDASHES, OPTSIGONTOP, OPTSORTRE, -@@ -876,6 +878,7 @@ typedef struct _context +@@ -880,6 +882,7 @@ typedef struct _context { char *path; FILE *fp; @@ -833,7 +834,7 @@ index 4db92a6..61a9612 100644 time_t mtime; off_t size; off_t vsize; -@@ -916,6 +919,7 @@ typedef struct _context +@@ -920,6 +923,7 @@ typedef struct _context unsigned int quiet : 1; /* inhibit status messages? */ unsigned int collapsed : 1; /* are all threads collapsed? */ unsigned int closing : 1; /* mailbox is being closed */ @@ -842,7 +843,7 @@ index 4db92a6..61a9612 100644 /* driver hooks */ void *data; /* driver specific data */ diff --git a/mutt_curses.h b/mutt_curses.h -index f8d6f88..aee797e 100644 +index f8bc47c..ef9884e 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -64,6 +64,7 @@ @@ -853,20 +854,20 @@ index f8d6f88..aee797e 100644 #define CLEARLINE(x) move(x,0), clrtoeol() #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x) #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0) -@@ -120,6 +121,8 @@ enum - MT_COLOR_BOLD, +@@ -121,6 +122,8 @@ enum MT_COLOR_UNDERLINE, MT_COLOR_INDEX, + MT_COLOR_PROMPT, + MT_COLOR_NEW, + MT_COLOR_FLAGGED, MT_COLOR_MAX }; diff --git a/muttlib.c b/muttlib.c -index c0d2026..9086f07 100644 +index c1d565f..039e7c3 100644 --- a/muttlib.c +++ b/muttlib.c -@@ -1284,6 +1284,8 @@ void mutt_FormatString (char *dest, /* output buffer */ +@@ -1279,6 +1279,8 @@ void mutt_FormatString (char *dest, /* output buffer */ pl = pw = 1; /* see if there's room to add content, else ignore */ @@ -875,7 +876,7 @@ index c0d2026..9086f07 100644 if ((col < COLS && wlen < destlen) || soft) { int pad; -@@ -1327,6 +1329,52 @@ void mutt_FormatString (char *dest, /* output buffer */ +@@ -1322,6 +1324,52 @@ void mutt_FormatString (char *dest, /* output buffer */ col += wid; src += pl; } @@ -929,7 +930,7 @@ index c0d2026..9086f07 100644 } else if (ch == '|') diff --git a/mx.c b/mx.c -index 07dba0c..cbee47d 100644 +index 0a1a80e..e80b8ff 100644 --- a/mx.c +++ b/mx.c @@ -595,6 +595,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int flags) @@ -984,7 +985,7 @@ index 2ef4ec7..4aabadf 100644 int maildir_read_dir (CONTEXT *); diff --git a/pager.c b/pager.c -index 7b61266..469efe4 100644 +index c99f1e4..5cfcb75 100644 --- a/pager.c +++ b/pager.c @@ -29,6 +29,7 @@ @@ -1054,7 +1055,7 @@ index 7b61266..469efe4 100644 + mutt_paddstr (COLS-SidebarWidth, bn); } NORMAL_COLOR; - if (option(OPTXTERMSETTITLES)) + if (option(OPTTSENABLED) && TSSupported) @@ -1826,16 +1830,21 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra) /* redraw the pager_index indicator, because the * flags for this message might have changed. */ diff --git a/smime.rc.patch b/smime.rc.patch index 7953f5ab9428..aef19714d28c 100644 --- a/smime.rc.patch +++ b/smime.rc.patch @@ -11,7 +11,7 @@ Gbp-Pq: Topic misc 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/contrib/smime.rc b/contrib/smime.rc -index 5376089..efb0b6e 100644 +index 0f85421..f0fae0f 100644 --- a/contrib/smime.rc +++ b/contrib/smime.rc @@ -4,33 +4,34 @@ @@ -21,7 +21,7 @@ index 5376089..efb0b6e 100644 -set smime_is_default +#set smime_is_default - # Uncoment this if you don't want to set labels for certificates you add. + # Uncomment this if you don't want to set labels for certificates you add. # unset smime_ask_cert_label # Passphrase expiration @@ -47,7 +47,7 @@ index 5376089..efb0b6e 100644 -set smime_default_key="12345678.0" +#set smime_default_key="12345678.0" - # Uncommen to make mutt ask what key to use when trying to decrypt a message. + # Uncomment to make mutt ask what key to use when trying to decrypt a message. # It will use the default key above (if that was set) else. # unset smime_decrypt_use_default_key diff --git a/trash-folder.patch b/trash-folder.patch index 7acd7bb94017..ce47b0c30e5d 100644 --- a/trash-folder.patch +++ b/trash-folder.patch @@ -62,7 +62,7 @@ Gbp-Pq: Topic features 9 files changed, 103 insertions(+), 2 deletions(-) diff --git a/commands.c b/commands.c -index 6b23e39..300d95c 100644 +index 5dbd100..7fd014b 100644 --- a/commands.c +++ b/commands.c @@ -720,6 +720,7 @@ int _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int dec @@ -111,22 +111,22 @@ index f0f3d81..dfa6a50 100644 if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) diff --git a/globals.h b/globals.h -index 584cd0c..a7e2304 100644 +index e77030c..6a1b8da 100644 --- a/globals.h +++ b/globals.h -@@ -139,6 +139,7 @@ WHERE char *StChars; - WHERE char *Status; - WHERE char *Tempdir; - WHERE char *Tochars; +@@ -144,6 +144,7 @@ WHERE char *Tochars; + WHERE char *TSStatusFormat; + WHERE char *TSIconFormat; + WHERE short TSSupported; +WHERE char *TrashPath; WHERE char *Username; WHERE char *Visual; - WHERE char *XtermTitle; + diff --git a/imap/message.c b/imap/message.c -index 38da127..3c9822f 100644 +index 3877381..039fda6 100644 --- a/imap/message.c +++ b/imap/message.c -@@ -876,6 +876,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) +@@ -884,6 +884,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) if (ctx->hdrs[n]->tagged) { mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1); @@ -134,7 +134,7 @@ index 38da127..3c9822f 100644 if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0); } -@@ -883,6 +884,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) +@@ -891,6 +892,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) else { mutt_set_flag (ctx, h, M_DELETE, 1); @@ -143,12 +143,12 @@ index 38da127..3c9822f 100644 mutt_set_flag (ctx, h, M_TAG, 0); } diff --git a/init.h b/init.h -index cf8e75a..d4a882b 100644 +index 6b49341..d3206f9 100644 --- a/init.h +++ b/init.h -@@ -3241,6 +3241,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. +@@ -3341,6 +3341,16 @@ struct option_t MuttVars[] = { + ** provided that ``$$ts_enabled'' has been set. This string is identical in + ** formatting to the one used by ``$$status_format''. */ + { "trash", DT_PATH, R_NONE, UL &TrashPath, 0 }, + /* @@ -164,7 +164,7 @@ index cf8e75a..d4a882b 100644 { "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 }, /* diff --git a/mutt.h b/mutt.h -index 1d7e177..0b879b9 100644 +index f8565fa..29bb6c2 100644 --- a/mutt.h +++ b/mutt.h @@ -185,6 +185,7 @@ enum @@ -175,7 +175,7 @@ index 1d7e177..0b879b9 100644 M_FLAG, M_TAG, M_UNTAG, -@@ -709,6 +710,7 @@ typedef struct header +@@ -713,6 +714,7 @@ typedef struct header unsigned int mime : 1; /* has a MIME-Version header? */ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; @@ -183,7 +183,7 @@ index 1d7e177..0b879b9 100644 unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -@@ -881,6 +883,7 @@ typedef struct _context +@@ -885,6 +887,7 @@ typedef struct _context int new; /* how many new messages? */ int unread; /* how many unread messages? */ int deleted; /* how many deleted messages */ @@ -192,10 +192,10 @@ index 1d7e177..0b879b9 100644 int msgnotreadyet; /* which msg "new" in pager, -1 if none */ diff --git a/muttlib.c b/muttlib.c -index 8005e9c..0425d45 100644 +index 02067cc..0fd9766 100644 --- a/muttlib.c +++ b/muttlib.c -@@ -1510,7 +1510,9 @@ int mutt_save_confirm (const char *s, struct stat *st) +@@ -1505,7 +1505,9 @@ int mutt_save_confirm (const char *s, struct stat *st) if (magic > 0 && !mx_access (s, W_OK)) { @@ -207,7 +207,7 @@ index 8005e9c..0425d45 100644 snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s); if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO) diff --git a/mx.c b/mx.c -index f599f6c..f7fd01f 100644 +index 4c5cb07..c0a6d30 100644 --- a/mx.c +++ b/mx.c @@ -776,6 +776,53 @@ static int sync_mailbox (CONTEXT *ctx, int *index_hint) @@ -301,7 +301,7 @@ index f599f6c..f7fd01f 100644 if (ctx->magic == M_IMAP) rc = imap_sync_mailbox (ctx, purge, index_hint); diff --git a/postpone.c b/postpone.c -index 801ef10..21e96e6 100644 +index a703161..7a4cbb1 100644 --- a/postpone.c +++ b/postpone.c @@ -277,6 +277,9 @@ int mutt_get_postponed (CONTEXT *ctx, HEADER *hdr, HEADER **cur, char *fcc, size diff --git a/update_german_translation.patch b/update_german_translation.patch deleted file mode 100644 index a7df39dd6f6a..000000000000 --- a/update_german_translation.patch +++ /dev/null @@ -1,115 +0,0 @@ -From: Christoph Berg <myon@debian.org> -Date: Fri, 14 Mar 2014 08:41:46 +0100 -Subject: update_german_translation - -Gbp-Pq: Topic translations ---- - po/de.po | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/po/de.po b/po/de.po -index 75d56f3..a2218c8 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -3,7 +3,7 @@ msgstr "" - "Project-Id-Version: 1.5.20\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2014-03-12 09:18-0700\n" --"PO-Revision-Date: 2008-05-18 10:28+0200\n" -+"PO-Revision-Date: 2014-03-14 08:34+0100\n" - "Last-Translator: Rocco Rutte <pdmef@gmx.net>\n" - "Language-Team: German <mutt-po@mutt.org>\n" - "Language: de\n" -@@ -587,9 +587,8 @@ msgid "Descrip" - msgstr "Beschr." - - #: compose.c:117 --#, fuzzy - msgid "Not supported" --msgstr "Markieren wird nicht unterstützt." -+msgstr "Nicht unterstützt" - - #: compose.c:122 - msgid "Sign, Encrypt" -@@ -1742,7 +1741,6 @@ msgstr "L - #. * declared "static" (sigh) - #. - #: edit.c:41 --#, fuzzy - msgid "" - "~~\t\tinsert a line beginning with a single ~\n" - "~b users\tadd users to the Bcc: field\n" -@@ -2654,7 +2652,6 @@ msgstr "" - " mutt -v[v]\n" - - #: main.c:124 --#, fuzzy - msgid "" - "options:\n" - " -A <alias>\texpand the given alias\n" -@@ -2667,6 +2664,7 @@ msgstr "" - "Optionen:\n" - " -A <alias>\tExpandiere den angegebenen Alias\n" - " -a <file>\tHängt Datei an die Message an\n" -+"\t\tDie Dateiliste muss mit \"--\" beendet werden\n" - " -b <address>\tEmpfänger einer unsichtbaren Kopie (Bcc:)\n" - " -c <address>\tEmpfänger einer Kopie (Cc:)\n" - " -D\t\tGib die Werte aller Variablen aus" -@@ -3004,9 +3002,8 @@ msgid "Unable to get certificate from peer" - msgstr "Kann kein Zertifikat vom Server erhalten" - - #: mutt_ssl.c:424 --#, fuzzy, c-format - msgid "%s connection using %s (%s)" --msgstr "SSL Verbindung unter Verwendung von %s (%s)" -+msgstr "%s-Verbindung unter Verwendung von %s (%s)" - - #: mutt_ssl.c:526 - msgid "Unknown" -@@ -3396,9 +3393,8 @@ msgid "error in pattern at: %s" - msgstr "Fehler in Muster bei: %s" - - #: pattern.c:830 --#, fuzzy, c-format - msgid "missing pattern: %s" --msgstr "Fehlender Parameter" -+msgstr "Fehlendes Muster: %s" - - #: pattern.c:840 - #, c-format -@@ -3516,9 +3512,8 @@ msgid "Can't invoke PGP" - msgstr "Kann PGP nicht aufrufen" - - #: pgp.c:1590 --#, fuzzy, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? " --msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? " -+msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s-Format, (k)ein PGP? " - - #: pgp.c:1591 - msgid "PGP/M(i)ME" -@@ -3533,22 +3528,19 @@ msgstr "(i)nline" - #. * it. The 'i' key is appended in this version. - #. - #: pgp.c:1597 --#, fuzzy - msgid "esabfci" --msgstr "vsabpku" -+msgstr "vsabfki" - - #. The keys accepted *must* be a prefix of the accepted keys in the "if" - #. * clause above since the switch statement below depends on it. - #. - #: pgp.c:1604 --#, fuzzy - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? " - msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, %s, (k)ein PGP? " - - #: pgp.c:1605 --#, fuzzy - msgid "esabfc" --msgstr "vsabpku" -+msgstr "vsabfk" - - #: pgpinvoke.c:308 - msgid "Fetching PGP key..." diff --git a/use_usr_bin_editor.patch b/use_usr_bin_editor.patch index 87abb8a5ee99..fc2fd2bb17ee 100644 --- a/use_usr_bin_editor.patch +++ b/use_usr_bin_editor.patch @@ -13,10 +13,10 @@ Gbp-Pq: Topic debian-specific 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init.c b/init.c -index 1401664..e0a0757 100644 +index 767d43c..b08439e 100644 --- a/init.c +++ b/init.c -@@ -3129,7 +3129,7 @@ void mutt_init (int skip_sys_rc, LIST *commands) +@@ -3107,7 +3107,7 @@ void mutt_init (int skip_sys_rc, LIST *commands) { p = getenv ("EDITOR"); if (!p) @@ -26,10 +26,10 @@ index 1401664..e0a0757 100644 Editor = safe_strdup (p); Visual = safe_strdup (p); diff --git a/init.h b/init.h -index 0e4f47f..7768683 100644 +index a1c4180..27bc371 100644 --- a/init.h +++ b/init.h -@@ -686,7 +686,7 @@ struct option_t MuttVars[] = { +@@ -715,7 +715,7 @@ struct option_t MuttVars[] = { ** .pp ** This variable specifies which editor is used by mutt. ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment |