summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--sidebar.patch269
-rw-r--r--trash.patch103
4 files changed, 262 insertions, 124 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89f7f4f04dcf..14d77262a975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mutt-sidebar
pkgdesc = Small but very powerful text-based mail client with sidebar and trash patches from NeoMutt
pkgver = 1.6.1
- pkgrel = 1
+ pkgrel = 2
url = http://www.mutt.org/
arch = i686
arch = x86_64
@@ -24,8 +24,8 @@ pkgbase = mutt-sidebar
validpgpkeys = 8975A9B33AA37910385C5308ADEF768480316BDA
sha1sums = ff1c76209a5c299018fc72b9e2e1ab98bf5138dd
sha1sums = SKIP
- sha1sums = 4303a9aa21265e5fc52da8624b165c80849d15a5
- sha1sums = 44e6bf580c9e4495c2f81fc23878ad139c4c73a2
+ sha1sums = 7ac8afb3e65fc06ffcc8d49ba8f6fc73de668606
+ sha1sums = 4ade2b9e92181e7084d4b636095e92d681692798
pkgname = mutt-sidebar
diff --git a/PKGBUILD b/PKGBUILD
index 55b926ba23ff..bed17bb3cdb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
pkgname=mutt-sidebar
_pkgname=mutt
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc='Small but very powerful text-based mail client with sidebar and trash patches from NeoMutt'
url='http://www.mutt.org/'
license=('GPL')
@@ -15,14 +15,14 @@ source=("http://ftp.mutt.org/pub/mutt/${_pkgname}-${pkgver}.tar.gz"{,.asc}
"trash.patch")
sha1sums=('ff1c76209a5c299018fc72b9e2e1ab98bf5138dd'
'SKIP'
- '4303a9aa21265e5fc52da8624b165c80849d15a5'
- '44e6bf580c9e4495c2f81fc23878ad139c4c73a2')
+ '7ac8afb3e65fc06ffcc8d49ba8f6fc73de668606'
+ '4ade2b9e92181e7084d4b636095e92d681692798')
validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA')
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/sidebar.patch"
patch -Np1 -i "${srcdir}/trash.patch"
+ patch -Np1 -i "${srcdir}/sidebar.patch"
}
build() {
diff --git a/sidebar.patch b/sidebar.patch
index 6371a66d774c..e1ab1c303447 100644
--- a/sidebar.patch
+++ b/sidebar.patch
@@ -1,6 +1,6 @@
diff -urN mutt-1.6.1/buffy.c mutt-1.6.1-sidebar/buffy.c
---- mutt-1.6.1/buffy.c 2016-05-02 03:02:12.397171385 +0100
-+++ mutt-1.6.1-sidebar/buffy.c 2016-05-02 03:02:15.009212943 +0100
+--- mutt-1.6.1/buffy.c 2016-05-30 14:49:21.083679691 +0100
++++ mutt-1.6.1-sidebar/buffy.c 2016-05-30 14:49:24.367731035 +0100
@@ -27,6 +27,10 @@
#include "mutt_curses.h"
@@ -299,8 +299,8 @@ diff -urN mutt-1.6.1/buffy.c mutt-1.6.1-sidebar/buffy.c
BuffyDoneTime = BuffyTime;
return (BuffyCount);
diff -urN mutt-1.6.1/buffy.h mutt-1.6.1-sidebar/buffy.h
---- mutt-1.6.1/buffy.h 2016-05-02 03:02:12.397171385 +0100
-+++ mutt-1.6.1-sidebar/buffy.h 2016-05-02 03:02:15.010212959 +0100
+--- mutt-1.6.1/buffy.h 2016-05-30 14:49:21.083679691 +0100
++++ mutt-1.6.1-sidebar/buffy.h 2016-05-30 14:49:24.368731051 +0100
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
@@ -347,8 +347,8 @@ diff -urN mutt-1.6.1/buffy.h mutt-1.6.1-sidebar/buffy.h
+
+#endif /* _BUFFY_H */
diff -urN mutt-1.6.1/color.c mutt-1.6.1-sidebar/color.c
---- mutt-1.6.1/color.c 2016-05-02 03:02:12.397171385 +0100
-+++ mutt-1.6.1-sidebar/color.c 2016-05-02 03:02:15.010212959 +0100
+--- mutt-1.6.1/color.c 2016-05-30 14:49:21.083679691 +0100
++++ mutt-1.6.1-sidebar/color.c 2016-05-30 14:49:24.368731051 +0100
@@ -94,6 +94,14 @@
{ "underline", MT_COLOR_UNDERLINE },
{ "index", MT_COLOR_INDEX },
@@ -375,8 +375,8 @@ diff -urN mutt-1.6.1/color.c mutt-1.6.1-sidebar/color.c
ColorDefs[MT_COLOR_BOLD] = 0;
ColorDefs[MT_COLOR_UNDERLINE] = 0;
diff -urN mutt-1.6.1/compose.c mutt-1.6.1-sidebar/compose.c
---- mutt-1.6.1/compose.c 2016-05-02 03:02:12.398171401 +0100
-+++ mutt-1.6.1-sidebar/compose.c 2016-05-02 03:02:15.010212959 +0100
+--- mutt-1.6.1/compose.c 2016-05-30 14:49:21.084679706 +0100
++++ mutt-1.6.1-sidebar/compose.c 2016-05-30 14:49:24.368731051 +0100
@@ -32,6 +32,9 @@
#include "mailbox.h"
#include "sort.h"
@@ -405,7 +405,7 @@ diff -urN mutt-1.6.1/compose.c mutt-1.6.1-sidebar/compose.c
if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
{
-@@ -145,7 +148,7 @@
+@@ -145,16 +148,16 @@
addstr (_(" (OppEnc mode)"));
clrtoeol ();
@@ -414,6 +414,17 @@ diff -urN mutt-1.6.1/compose.c mutt-1.6.1-sidebar/compose.c
clrtoeol ();
if ((WithCrypto & APPLICATION_PGP)
+ && (msg->security & APPLICATION_PGP) && (msg->security & SIGN))
+- printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
++ printw (TITLE_FMT "%s", _("sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
+
+ if ((WithCrypto & APPLICATION_SMIME)
+ && (msg->security & APPLICATION_SMIME) && (msg->security & SIGN)) {
+- printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
++ printw (TITLE_FMT "%s", _("sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
+ }
+
+ if ((WithCrypto & APPLICATION_SMIME)
@@ -162,7 +165,7 @@
&& (msg->security & ENCRYPT)
&& SmimeCryptAlg
@@ -505,8 +516,8 @@ diff -urN mutt-1.6.1/compose.c mutt-1.6.1-sidebar/compose.c
fccSet = 1;
}
diff -urN mutt-1.6.1/configure.ac mutt-1.6.1-sidebar/configure.ac
---- mutt-1.6.1/configure.ac 2016-05-02 03:02:12.398171401 +0100
-+++ mutt-1.6.1-sidebar/configure.ac 2016-05-02 03:02:15.011212974 +0100
+--- mutt-1.6.1/configure.ac 2016-05-30 14:49:21.084679706 +0100
++++ mutt-1.6.1-sidebar/configure.ac 2016-05-30 14:49:24.369731066 +0100
@@ -175,6 +175,15 @@
SMIMEAUX_TARGET="smime_keys"
fi
@@ -524,8 +535,8 @@ diff -urN mutt-1.6.1/configure.ac mutt-1.6.1-sidebar/configure.ac
[if test "$withval" != no
then
diff -urN mutt-1.6.1/copy.c mutt-1.6.1-sidebar/copy.c
---- mutt-1.6.1/copy.c 2016-05-02 03:02:12.398171401 +0100
-+++ mutt-1.6.1-sidebar/copy.c 2016-05-02 03:02:15.011212974 +0100
+--- mutt-1.6.1/copy.c 2016-05-30 14:49:21.085679722 +0100
++++ mutt-1.6.1-sidebar/copy.c 2016-05-30 14:49:24.369731066 +0100
@@ -288,7 +288,7 @@
if (flags & (CH_DECODE|CH_PREFIX))
{
@@ -536,8 +547,8 @@ diff -urN mutt-1.6.1/copy.c mutt-1.6.1-sidebar/copy.c
error = TRUE;
break;
diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-sidebar/curs_main.c
---- mutt-1.6.1/curs_main.c 2016-05-02 03:02:12.400171433 +0100
-+++ mutt-1.6.1-sidebar/curs_main.c 2016-05-02 03:02:15.012212990 +0100
+--- mutt-1.6.1/curs_main.c 2016-05-30 14:49:21.086679738 +0100
++++ mutt-1.6.1-sidebar/curs_main.c 2016-05-30 14:49:24.370731082 +0100
@@ -26,8 +26,13 @@
#include "mailbox.h"
#include "mapping.h"
@@ -692,8 +703,8 @@ diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-sidebar/curs_main.c
if (menu->menu == MENU_MAIN)
km_error_key (MENU_MAIN);
diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
---- mutt-1.6.1/doc/manual.xml.head 2016-05-02 03:02:12.402171465 +0100
-+++ mutt-1.6.1-sidebar/doc/manual.xml.head 2016-05-02 03:02:15.014213022 +0100
+--- mutt-1.6.1/doc/manual.xml.head 2016-05-30 14:49:21.089679784 +0100
++++ mutt-1.6.1-sidebar/doc/manual.xml.head 2016-05-30 14:49:24.372731113 +0100
@@ -405,6 +405,623 @@
</sect2>
@@ -1318,7 +1329,42 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
<sect2 id="intro-help">
<title>Help</title>
-@@ -8081,6 +8698,469 @@
+@@ -6773,6 +7390,17 @@
+ </para>
+
+ <para>
++Mutt will set the <literal>COLUMNS</literal> environment variable to
++the width of the pager. Some programs make use of this environment
++variable automatically. Others provide a command line argument that
++can use this to set the output width:
++</para>
++
++<screen>
++text/html; lynx -dump -width ${COLUMNS:-80} %s; copiousoutput
++</screen>
++
++<para>
+ Note that when using the built-in pager, <emphasis>only</emphasis>
+ entries with this flag will be considered a handler for a MIME type
+ &mdash; all other entries will be ignored.
+@@ -7467,6 +8095,16 @@
+
+ </sect2>
+
++<sect2 id="mutt-patches">
++<title>Mutt Patches</title>
++<para>
++Mutt may also be <quote>patched</quote> to support smaller features.
++These patches should add a free-form string to the end Mutt's version string.
++Running <literal>mutt -v</literal> might show:
++<screen>patch-1.6.1.sidebar.20160502</screen>
++</para>
++</sect2>
++
+ <sect2 id="url-syntax">
+ <title>URL Syntax</title>
+
+@@ -8081,6 +8719,469 @@
</sect1>
@@ -1337,7 +1383,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
+
+ <itemizedlist>
+ <title>Dependencies:</title>
-+ <listitem><para>mutt-1.5.24</para></listitem>
++ <listitem><para>mutt-1.6.1</para></listitem>
+ </itemizedlist>
+
+ <para>This patch is part of the <ulink url="http://www.neomutt.org/">NeoMutt Project</ulink>.</para>
@@ -1788,7 +1834,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
</chapter>
<chapter id="security">
-@@ -9237,6 +10317,17 @@
+@@ -9237,6 +10338,17 @@
<listitem>
<cmdsynopsis>
@@ -1806,9 +1852,42 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
<command><link linkend="source">source</link></command>
<arg choice="plain">
<replaceable class="parameter">filename</replaceable>
+diff -urN mutt-1.6.1/doc/mutt.css mutt-1.6.1-sidebar/doc/mutt.css
+--- mutt-1.6.1/doc/mutt.css 2016-05-30 14:49:21.089679784 +0100
++++ mutt-1.6.1-sidebar/doc/mutt.css 2016-05-30 14:49:24.281729690 +0100
+@@ -9,17 +9,24 @@
+ div.table-contents table th, div.informaltable table th {
+ font-family:sans-serif;
+ background:#d0d0d0;
+- font-weight:normal;
++ font-weight:bold;
+ vertical-align:top;
+ }
+-div.cmdsynopsis { border-left:1px solid #707070; padding-left:5px; }
++div.cmdsynopsis { border-left:1px solid #707070; padding-left: 1em; }
+ li div.cmdsynopsis { border-left:none; padding-left:0px; }
+-pre.screen, div.note { background:#f0f0f0; border:1px solid #c0c0c0; padding:5px; margin-left:2%; margin-right:2%; }
++li p { margin: 0; }
++pre.screen, div.note { border:1px solid #c0c0c0; margin-left:2%; margin-right:2%; }
++pre.screen { color: #ffffff; background:#000000; padding: 0.5em; }
++div.note { background:#ffff80; padding: 0.5em; }
+ div.example p.title { margin-left:2%; }
+ div.note h3 { font-size:small; font-style:italic; font-variant: small-caps; }
+ div.note h3:after { content: ":" }
+ div.note { margin-bottom: 5px; }
+-.command { font-family: monospace; font-weight: normal; }
++div.literallayout, .command { font-family: monospace; font-weight: normal; }
+ .command strong { font-weight: normal; }
+ tr { vertical-align: top; }
+-.comment { color:#707070; }
++.comment { color:#00c000; }
++code.literal { background: #f0f0f0; color: #000000; }
++span.indicator { background: #000060; color: #ffffff; }
++span.highlight { background: #404040; color: #ffffff; }
++span.reverse { background: #ffffff; color: #000000; }
diff -urN mutt-1.6.1/doc/muttrc.sidebar mutt-1.6.1-sidebar/doc/muttrc.sidebar
--- mutt-1.6.1/doc/muttrc.sidebar 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/doc/muttrc.sidebar 2016-05-02 03:02:14.932211718 +0100
++++ mutt-1.6.1-sidebar/doc/muttrc.sidebar 2016-05-30 14:49:24.282729706 +0100
@@ -0,0 +1,116 @@
+# This is a complete list of sidebar-related configuration.
+
@@ -1928,7 +2007,7 @@ diff -urN mutt-1.6.1/doc/muttrc.sidebar mutt-1.6.1-sidebar/doc/muttrc.sidebar
+# vim: syntax=muttrc
diff -urN mutt-1.6.1/doc/vimrc.sidebar mutt-1.6.1-sidebar/doc/vimrc.sidebar
--- mutt-1.6.1/doc/vimrc.sidebar 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/doc/vimrc.sidebar 2016-05-02 03:02:14.933211733 +0100
++++ mutt-1.6.1-sidebar/doc/vimrc.sidebar 2016-05-30 14:49:24.283729722 +0100
@@ -0,0 +1,35 @@
+" Vim syntax file for the mutt sidebar patch
+
@@ -1965,9 +2044,38 @@ diff -urN mutt-1.6.1/doc/vimrc.sidebar mutt-1.6.1-sidebar/doc/vimrc.sidebar
+syntax keyword muttrcColorField contained sidebar_new
+
+" vim: syntax=vim
+diff -urN mutt-1.6.1/filter.c mutt-1.6.1-sidebar/filter.c
+--- mutt-1.6.1/filter.c 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-sidebar/filter.c 2016-05-30 14:49:24.284729737 +0100
+@@ -21,6 +21,7 @@
+ #endif
+
+ #include "mutt.h"
++#include "mutt_curses.h"
+
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -34,6 +35,7 @@
+ int fdin, int fdout, int fderr)
+ {
+ int pin[2], pout[2], perr[2], thepid;
++ char columns[11];
+
+ if (in)
+ {
+@@ -117,6 +119,9 @@
+ close (fderr);
+ }
+
++ snprintf (columns, sizeof (columns), "%d", COLS - SidebarWidth);
++ setenv ("COLUMNS", columns, 1);
++
+ execl (EXECSHELL, "sh", "-c", cmd, NULL);
+ _exit (127);
+ }
diff -urN mutt-1.6.1/flags.c mutt-1.6.1-sidebar/flags.c
---- mutt-1.6.1/flags.c 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-sidebar/flags.c 2016-05-02 03:02:15.015213038 +0100
+--- mutt-1.6.1/flags.c 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-sidebar/flags.c 2016-05-30 14:49:24.373731129 +0100
@@ -25,6 +25,10 @@
#include "sort.h"
#include "mx.h"
@@ -1990,8 +2098,8 @@ diff -urN mutt-1.6.1/flags.c mutt-1.6.1-sidebar/flags.c
void mutt_tag_set_flag (int flag, int bf)
diff -urN mutt-1.6.1/functions.h mutt-1.6.1-sidebar/functions.h
---- mutt-1.6.1/functions.h 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-sidebar/functions.h 2016-05-02 03:02:15.015213038 +0100
+--- mutt-1.6.1/functions.h 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-sidebar/functions.h 2016-05-30 14:49:24.373731129 +0100
@@ -168,6 +168,16 @@
{ "decrypt-copy", OP_DECRYPT_COPY, NULL },
{ "decrypt-save", OP_DECRYPT_SAVE, NULL },
@@ -2028,8 +2136,8 @@ diff -urN mutt-1.6.1/functions.h mutt-1.6.1-sidebar/functions.h
};
diff -urN mutt-1.6.1/globals.h mutt-1.6.1-sidebar/globals.h
---- mutt-1.6.1/globals.h 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-sidebar/globals.h 2016-05-02 03:02:15.015213038 +0100
+--- mutt-1.6.1/globals.h 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-sidebar/globals.h 2016-05-30 14:49:24.373731129 +0100
@@ -118,6 +118,12 @@
WHERE char *SendCharset;
WHERE char *Sendmail;
@@ -2059,8 +2167,8 @@ diff -urN mutt-1.6.1/globals.h mutt-1.6.1-sidebar/globals.h
WHERE short ImapKeepalive;
WHERE short ImapPipelineDepth;
diff -urN mutt-1.6.1/imap/command.c mutt-1.6.1-sidebar/imap/command.c
---- mutt-1.6.1/imap/command.c 2016-05-02 03:02:12.404171496 +0100
-+++ mutt-1.6.1-sidebar/imap/command.c 2016-05-02 03:02:14.939211829 +0100
+--- mutt-1.6.1/imap/command.c 2016-05-30 14:49:21.092679831 +0100
++++ mutt-1.6.1-sidebar/imap/command.c 2016-05-30 14:49:24.287729784 +0100
@@ -1016,6 +1016,14 @@
opened */
status->uidnext = oldun;
@@ -2077,8 +2185,8 @@ diff -urN mutt-1.6.1/imap/command.c mutt-1.6.1-sidebar/imap/command.c
return;
}
diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-sidebar/imap/imap.c
---- mutt-1.6.1/imap/imap.c 2016-05-02 03:02:12.404171496 +0100
-+++ mutt-1.6.1-sidebar/imap/imap.c 2016-05-02 03:02:15.016213054 +0100
+--- mutt-1.6.1/imap/imap.c 2016-05-30 14:49:21.092679831 +0100
++++ mutt-1.6.1-sidebar/imap/imap.c 2016-05-30 14:49:24.374731144 +0100
@@ -1535,7 +1535,11 @@
imap_munge_mbox_name (idata, munged, sizeof (munged), name);
@@ -2092,8 +2200,8 @@ diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-sidebar/imap/imap.c
if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
{
diff -urN mutt-1.6.1/init.c mutt-1.6.1-sidebar/init.c
---- mutt-1.6.1/init.c 2016-05-02 03:02:12.405171512 +0100
-+++ mutt-1.6.1-sidebar/init.c 2016-05-02 03:02:15.017213070 +0100
+--- mutt-1.6.1/init.c 2016-05-30 14:49:21.093679847 +0100
++++ mutt-1.6.1-sidebar/init.c 2016-05-30 14:49:24.375731160 +0100
@@ -2173,6 +2173,9 @@
case DT_SORT_AUX:
map = SortAuxMethods;
@@ -2105,8 +2213,8 @@ diff -urN mutt-1.6.1/init.c mutt-1.6.1-sidebar/init.c
map = SortMethods;
break;
diff -urN mutt-1.6.1/init.h mutt-1.6.1-sidebar/init.h
---- mutt-1.6.1/init.h 2016-05-02 03:02:12.407171544 +0100
-+++ mutt-1.6.1-sidebar/init.h 2016-05-02 03:02:15.018213086 +0100
+--- mutt-1.6.1/init.h 2016-05-30 14:49:21.095679878 +0100
++++ mutt-1.6.1-sidebar/init.h 2016-05-30 14:49:24.377731191 +0100
@@ -42,11 +42,12 @@
#define DTYPE(x) ((x) & DT_MASK)
@@ -2299,8 +2407,8 @@ diff -urN mutt-1.6.1/init.h mutt-1.6.1-sidebar/init.h
{ "spam", parse_spam_list, M_SPAM },
{ "nospam", parse_spam_list, M_NOSPAM },
diff -urN mutt-1.6.1/keymap.c mutt-1.6.1-sidebar/keymap.c
---- mutt-1.6.1/keymap.c 2016-05-02 03:02:12.407171544 +0100
-+++ mutt-1.6.1-sidebar/keymap.c 2016-05-02 03:02:14.946211940 +0100
+--- mutt-1.6.1/keymap.c 2016-05-30 14:49:21.096679894 +0100
++++ mutt-1.6.1-sidebar/keymap.c 2016-05-30 14:49:24.377731191 +0100
@@ -453,6 +453,9 @@
}
#endif
@@ -2312,8 +2420,8 @@ diff -urN mutt-1.6.1/keymap.c mutt-1.6.1-sidebar/keymap.c
tmp = mutt_getch();
timeout (-1);
diff -urN mutt-1.6.1/mailbox.h mutt-1.6.1-sidebar/mailbox.h
---- mutt-1.6.1/mailbox.h 2016-05-02 03:02:12.407171544 +0100
-+++ mutt-1.6.1-sidebar/mailbox.h 2016-05-02 03:02:15.018213086 +0100
+--- mutt-1.6.1/mailbox.h 2016-05-30 14:49:21.096679894 +0100
++++ mutt-1.6.1-sidebar/mailbox.h 2016-05-30 14:49:24.377731191 +0100
@@ -27,6 +27,9 @@
#define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses
* safe_fopen() for mbox-style folders.
@@ -2325,8 +2433,8 @@ diff -urN mutt-1.6.1/mailbox.h mutt-1.6.1-sidebar/mailbox.h
/* mx_open_new_message() */
#define M_ADD_FROM (1<<0) /* add a From_ line */
diff -urN mutt-1.6.1/main.c mutt-1.6.1-sidebar/main.c
---- mutt-1.6.1/main.c 2016-05-02 03:02:12.408171560 +0100
-+++ mutt-1.6.1-sidebar/main.c 2016-05-02 03:02:15.018213086 +0100
+--- mutt-1.6.1/main.c 2016-05-30 14:49:21.096679894 +0100
++++ mutt-1.6.1-sidebar/main.c 2016-05-30 14:49:24.378731207 +0100
@@ -31,6 +31,9 @@
#include "url.h"
#include "mutt_crypt.h"
@@ -2399,8 +2507,8 @@ diff -urN mutt-1.6.1/main.c mutt-1.6.1-sidebar/main.c
if (Context)
FREE (&Context);
diff -urN mutt-1.6.1/Makefile.am mutt-1.6.1-sidebar/Makefile.am
---- mutt-1.6.1/Makefile.am 2016-05-02 03:02:12.392171305 +0100
-+++ mutt-1.6.1-sidebar/Makefile.am 2016-05-02 03:02:15.005212879 +0100
+--- mutt-1.6.1/Makefile.am 2016-05-30 14:49:21.076679581 +0100
++++ mutt-1.6.1-sidebar/Makefile.am 2016-05-30 14:49:24.361730941 +0100
@@ -77,6 +77,12 @@
EXTRA_SCRIPTS = smime_keys
@@ -2428,8 +2536,8 @@ diff -urN mutt-1.6.1/Makefile.am mutt-1.6.1-sidebar/Makefile.am
reldate.h: $(srcdir)/ChangeLog
diff -urN mutt-1.6.1/mbox.c mutt-1.6.1-sidebar/mbox.c
---- mutt-1.6.1/mbox.c 2016-05-02 03:02:12.408171560 +0100
-+++ mutt-1.6.1-sidebar/mbox.c 2016-05-02 03:02:14.948211972 +0100
+--- mutt-1.6.1/mbox.c 2016-05-30 14:49:21.097679910 +0100
++++ mutt-1.6.1-sidebar/mbox.c 2016-05-30 14:49:24.378731207 +0100
@@ -100,6 +100,9 @@
mutt_perror (ctx->path);
return (-1);
@@ -2451,8 +2559,8 @@ diff -urN mutt-1.6.1/mbox.c mutt-1.6.1-sidebar/mbox.c
#ifdef NFS_ATTRIBUTE_HACK
if (sb.st_mtime > sb.st_atime)
diff -urN mutt-1.6.1/menu.c mutt-1.6.1-sidebar/menu.c
---- mutt-1.6.1/menu.c 2016-05-02 03:02:12.408171560 +0100
-+++ mutt-1.6.1-sidebar/menu.c 2016-05-02 03:02:15.019213102 +0100
+--- mutt-1.6.1/menu.c 2016-05-30 14:49:21.097679910 +0100
++++ mutt-1.6.1-sidebar/menu.c 2016-05-30 14:49:24.378731207 +0100
@@ -24,6 +24,9 @@
#include "mutt_curses.h"
#include "mutt_menu.h"
@@ -2556,8 +2664,8 @@ diff -urN mutt-1.6.1/menu.c mutt-1.6.1-sidebar/menu.c
move (menu->current - menu->top + menu->offset, 0);
else
diff -urN mutt-1.6.1/mh.c mutt-1.6.1-sidebar/mh.c
---- mutt-1.6.1/mh.c 2016-05-02 03:02:12.409171576 +0100
-+++ mutt-1.6.1-sidebar/mh.c 2016-05-02 03:02:15.019213102 +0100
+--- mutt-1.6.1/mh.c 2016-05-30 14:49:21.097679910 +0100
++++ mutt-1.6.1-sidebar/mh.c 2016-05-30 14:49:24.378731207 +0100
@@ -295,6 +295,49 @@
mhs_free_sequences (&mhs);
}
@@ -2609,8 +2717,8 @@ diff -urN mutt-1.6.1/mh.c mutt-1.6.1-sidebar/mh.c
{
int fd;
diff -urN mutt-1.6.1/mutt_curses.h mutt-1.6.1-sidebar/mutt_curses.h
---- mutt-1.6.1/mutt_curses.h 2016-05-02 03:02:12.409171576 +0100
-+++ mutt-1.6.1-sidebar/mutt_curses.h 2016-05-02 03:02:15.019213102 +0100
+--- mutt-1.6.1/mutt_curses.h 2016-05-30 14:49:21.098679925 +0100
++++ mutt-1.6.1-sidebar/mutt_curses.h 2016-05-30 14:49:24.379731223 +0100
@@ -64,6 +64,9 @@
#undef lines
#endif /* lines */
@@ -2637,8 +2745,8 @@ diff -urN mutt-1.6.1/mutt_curses.h mutt-1.6.1-sidebar/mutt_curses.h
};
diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-sidebar/mutt.h
---- mutt-1.6.1/mutt.h 2016-05-02 03:02:12.409171576 +0100
-+++ mutt-1.6.1-sidebar/mutt.h 2016-05-02 03:02:15.019213102 +0100
+--- mutt-1.6.1/mutt.h 2016-05-30 14:49:21.098679925 +0100
++++ mutt-1.6.1-sidebar/mutt.h 2016-05-30 14:49:24.379731223 +0100
@@ -428,6 +428,13 @@
OPTSAVEEMPTY,
OPTSAVENAME,
@@ -2674,8 +2782,8 @@ diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-sidebar/mutt.h
/* driver hooks */
void *data; /* driver specific data */
diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-sidebar/muttlib.c
---- mutt-1.6.1/muttlib.c 2016-05-02 03:02:12.410171592 +0100
-+++ mutt-1.6.1-sidebar/muttlib.c 2016-05-02 03:02:15.020213118 +0100
+--- mutt-1.6.1/muttlib.c 2016-05-30 14:49:21.099679941 +0100
++++ mutt-1.6.1-sidebar/muttlib.c 2016-05-30 14:49:24.380731238 +0100
@@ -1282,7 +1282,7 @@
pl = pw = 1;
@@ -2711,8 +2819,8 @@ diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-sidebar/muttlib.c
wptr += len;
wlen += len;
diff -urN mutt-1.6.1/mutt_menu.h mutt-1.6.1-sidebar/mutt_menu.h
---- mutt-1.6.1/mutt_menu.h 2016-05-02 03:02:12.409171576 +0100
-+++ mutt-1.6.1-sidebar/mutt_menu.h 2016-05-02 03:02:15.019213102 +0100
+--- mutt-1.6.1/mutt_menu.h 2016-05-30 14:49:21.098679925 +0100
++++ mutt-1.6.1-sidebar/mutt_menu.h 2016-05-30 14:49:24.379731223 +0100
@@ -34,6 +34,9 @@
#define REDRAW_FULL (1<<5)
#define REDRAW_BODY (1<<6)
@@ -2724,8 +2832,8 @@ diff -urN mutt-1.6.1/mutt_menu.h mutt-1.6.1-sidebar/mutt_menu.h
#define M_MODEFMT "-- Mutt: %s"
diff -urN mutt-1.6.1/mx.c mutt-1.6.1-sidebar/mx.c
---- mutt-1.6.1/mx.c 2016-05-02 03:02:12.410171592 +0100
-+++ mutt-1.6.1-sidebar/mx.c 2016-05-02 03:02:15.020213118 +0100
+--- mutt-1.6.1/mx.c 2016-05-30 14:49:21.099679941 +0100
++++ mutt-1.6.1-sidebar/mx.c 2016-05-30 14:49:24.380731238 +0100
@@ -29,6 +29,9 @@
#include "copy.h"
#include "keymap.h"
@@ -2802,8 +2910,8 @@ diff -urN mutt-1.6.1/mx.c mutt-1.6.1-sidebar/mx.c
if (read_msgs && quadoption (OPT_MOVE) != M_NO)
diff -urN mutt-1.6.1/mx.h mutt-1.6.1-sidebar/mx.h
---- mutt-1.6.1/mx.h 2016-05-02 03:02:12.410171592 +0100
-+++ mutt-1.6.1-sidebar/mx.h 2016-05-02 03:02:15.020213118 +0100
+--- mutt-1.6.1/mx.h 2016-05-30 14:49:21.099679941 +0100
++++ mutt-1.6.1-sidebar/mx.h 2016-05-30 14:49:24.380731238 +0100
@@ -26,6 +26,7 @@
#define _MX_H
@@ -2824,7 +2932,7 @@ diff -urN mutt-1.6.1/mx.h mutt-1.6.1-sidebar/mx.h
int maildir_read_dir (CONTEXT *);
diff -urN mutt-1.6.1/OPS.SIDEBAR mutt-1.6.1-sidebar/OPS.SIDEBAR
--- mutt-1.6.1/OPS.SIDEBAR 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/OPS.SIDEBAR 2016-05-02 03:02:15.005212879 +0100
++++ mutt-1.6.1-sidebar/OPS.SIDEBAR 2016-05-30 14:49:24.361730941 +0100
@@ -0,0 +1,8 @@
+OP_SIDEBAR_NEXT "Move the highlight to next mailbox"
+OP_SIDEBAR_NEXT_NEW "Move the highlight to next mailbox with new mail"
@@ -2835,8 +2943,8 @@ diff -urN mutt-1.6.1/OPS.SIDEBAR mutt-1.6.1-sidebar/OPS.SIDEBAR
+OP_SIDEBAR_PREV_NEW "Move the highlight to previous mailbox with new mail"
+OP_SIDEBAR_TOGGLE_VISIBLE "Make the Sidebar (in)visible"
diff -urN mutt-1.6.1/pager.c mutt-1.6.1-sidebar/pager.c
---- mutt-1.6.1/pager.c 2016-05-02 03:02:12.411171608 +0100
-+++ mutt-1.6.1-sidebar/pager.c 2016-05-02 03:02:15.021213134 +0100
+--- mutt-1.6.1/pager.c 2016-05-30 14:49:21.100679956 +0100
++++ mutt-1.6.1-sidebar/pager.c 2016-05-30 14:49:24.381731254 +0100
@@ -29,6 +29,9 @@
#include "pager.h"
#include "attach.h"
@@ -3024,13 +3132,13 @@ diff -urN mutt-1.6.1/pager.c mutt-1.6.1-sidebar/pager.c
ch = -1;
break;
diff -urN mutt-1.6.1/PATCHES mutt-1.6.1-sidebar/PATCHES
---- mutt-1.6.1/PATCHES 2016-05-02 03:02:12.396171369 +0100
-+++ mutt-1.6.1-sidebar/PATCHES 2016-05-02 03:02:15.008212927 +0100
+--- mutt-1.6.1/PATCHES 2016-05-30 14:49:21.081679659 +0100
++++ mutt-1.6.1-sidebar/PATCHES 2016-05-30 14:49:24.366731019 +0100
@@ -0,0 +1 @@
-+patch-sidebar-neo-20160502
++patch-sidebar-neo-20160530
diff -urN mutt-1.6.1/README.sidebar mutt-1.6.1-sidebar/README.sidebar
--- mutt-1.6.1/README.sidebar 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/README.sidebar 2016-05-02 03:02:15.008212927 +0100
++++ mutt-1.6.1-sidebar/README.sidebar 2016-05-30 14:49:24.268729487 +0100
@@ -0,0 +1,145 @@
+Sidebar Patch
+=============
@@ -3056,7 +3164,7 @@ diff -urN mutt-1.6.1/README.sidebar mutt-1.6.1-sidebar/README.sidebar
+ version.
+
+ Dependencies
-+ * mutt-1.5.24
++ * mutt-1.6.1
+
+Introduction
+------------
@@ -3177,9 +3285,22 @@ diff -urN mutt-1.6.1/README.sidebar mutt-1.6.1-sidebar/README.sidebar
+ * Tyler Earnest <tylere@rne.st>
+ * Richard Russon <rich@flatcap.org>
+
+diff -urN mutt-1.6.1/rfc3676.c mutt-1.6.1-sidebar/rfc3676.c
+--- mutt-1.6.1/rfc3676.c 2016-05-30 14:49:21.103680003 +0100
++++ mutt-1.6.1-sidebar/rfc3676.c 2016-05-30 14:49:24.321730316 +0100
+@@ -149,6 +149,9 @@
+ static int quote_width (STATE *s, int ql)
+ {
+ int width = mutt_term_width (ReflowWrap);
++#ifdef USE_SIDEBAR
++ width -= SidebarWidth;
++#endif
+ if (option(OPTTEXTFLOWED) && (s->flags & M_REPLYING))
+ {
+ /* When replying, force a wrap at FLOWED_MAX to comply with RFC3676
diff -urN mutt-1.6.1/sidebar.c mutt-1.6.1-sidebar/sidebar.c
--- mutt-1.6.1/sidebar.c 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/sidebar.c 2016-05-02 03:02:15.023213165 +0100
++++ mutt-1.6.1-sidebar/sidebar.c 2016-05-30 14:49:24.384731301 +0100
@@ -0,0 +1,1069 @@
+/* Copyright (C) 2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
@@ -4252,7 +4373,7 @@ diff -urN mutt-1.6.1/sidebar.c mutt-1.6.1-sidebar/sidebar.c
+}
diff -urN mutt-1.6.1/sidebar.h mutt-1.6.1-sidebar/sidebar.h
--- mutt-1.6.1/sidebar.h 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-sidebar/sidebar.h 2016-05-02 03:02:15.023213165 +0100
++++ mutt-1.6.1-sidebar/sidebar.h 2016-05-30 14:49:24.384731301 +0100
@@ -0,0 +1,36 @@
+/* Copyright (C) 2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
@@ -4291,8 +4412,8 @@ diff -urN mutt-1.6.1/sidebar.h mutt-1.6.1-sidebar/sidebar.h
+
+#endif /* SIDEBAR_H */
diff -urN mutt-1.6.1/sort.h mutt-1.6.1-sidebar/sort.h
---- mutt-1.6.1/sort.h 2016-05-02 03:02:12.440172071 +0100
-+++ mutt-1.6.1-sidebar/sort.h 2016-05-02 03:02:15.023213165 +0100
+--- mutt-1.6.1/sort.h 2016-05-30 14:49:21.104680019 +0100
++++ mutt-1.6.1-sidebar/sort.h 2016-05-30 14:49:24.385731316 +0100
@@ -31,6 +31,12 @@
#define SORT_KEYID 12
#define SORT_TRUST 13
diff --git a/trash.patch b/trash.patch
index 4b252003110c..7d6475462d7b 100644
--- a/trash.patch
+++ b/trash.patch
@@ -1,6 +1,6 @@
diff -urN mutt-1.6.1/commands.c mutt-1.6.1-trash/commands.c
---- mutt-1.6.1/commands.c 2016-05-02 03:02:12.398171401 +0100
-+++ mutt-1.6.1-trash/commands.c 2016-05-02 03:02:15.950227914 +0100
+--- mutt-1.6.1/commands.c 2016-05-30 14:49:21.083679691 +0100
++++ mutt-1.6.1-trash/commands.c 2016-05-30 14:49:25.107742605 +0100
@@ -720,6 +720,7 @@
if (option (OPTDELETEUNTAG))
mutt_set_flag (Context, h, M_TAG, 0);
@@ -10,8 +10,8 @@ diff -urN mutt-1.6.1/commands.c mutt-1.6.1-trash/commands.c
return 0;
}
diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-trash/curs_main.c
---- mutt-1.6.1/curs_main.c 2016-05-02 03:02:12.400171433 +0100
-+++ mutt-1.6.1-trash/curs_main.c 2016-05-02 03:02:15.953227962 +0100
+--- mutt-1.6.1/curs_main.c 2016-05-30 14:49:21.086679738 +0100
++++ mutt-1.6.1-trash/curs_main.c 2016-05-30 14:49:25.109742636 +0100
@@ -1919,6 +1919,7 @@
MAYBE_REDRAW (menu->redraw);
break;
@@ -66,9 +66,26 @@ diff -urN mutt-1.6.1/curs_main.c mutt-1.6.1-trash/curs_main.c
if (option (OPTRESOLVE))
{
diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-trash/doc/manual.xml.head
---- mutt-1.6.1/doc/manual.xml.head 2016-05-02 03:02:12.402171465 +0100
-+++ mutt-1.6.1-trash/doc/manual.xml.head 2016-05-02 03:02:15.955227994 +0100
-@@ -8081,6 +8081,175 @@
+--- mutt-1.6.1/doc/manual.xml.head 2016-05-30 14:49:21.089679784 +0100
++++ mutt-1.6.1-trash/doc/manual.xml.head 2016-05-30 14:49:25.111742667 +0100
+@@ -7467,6 +7467,16 @@
+
+ </sect2>
+
++<sect2 id="mutt-patches">
++<title>Mutt Patches</title>
++<para>
++Mutt may also be <quote>patched</quote> to support smaller features.
++These patches should add a free-form string to the end Mutt's version string.
++Running <literal>mutt -v</literal> might show:
++<screen>patch-1.6.1.sidebar.20160502</screen>
++</para>
++</sect2>
++
+ <sect2 id="url-syntax">
+ <title>URL Syntax</title>
+
+@@ -8081,6 +8091,175 @@
</sect1>
@@ -89,7 +106,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-trash/doc/manual.xml.head
+
+ <itemizedlist>
+ <title>Dependencies:</title>
-+ <listitem><para>mutt-1.5.24</para></listitem>
++ <listitem><para>mutt-1.6.1</para></listitem>
+ <listitem><para>IMAP support</para></listitem>
+ </itemizedlist>
+
@@ -246,7 +263,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-trash/doc/manual.xml.head
<chapter id="security">
diff -urN mutt-1.6.1/doc/muttrc.trash mutt-1.6.1-trash/doc/muttrc.trash
--- mutt-1.6.1/doc/muttrc.trash 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-trash/doc/muttrc.trash 2016-05-02 03:02:15.862226514 +0100
++++ mutt-1.6.1-trash/doc/muttrc.trash 2016-05-30 14:49:25.022741276 +0100
@@ -0,0 +1,16 @@
+# Example Mutt config file for the 'trash' feature.
+
@@ -266,7 +283,7 @@ diff -urN mutt-1.6.1/doc/muttrc.trash mutt-1.6.1-trash/doc/muttrc.trash
+# vim: syntax=muttrc
diff -urN mutt-1.6.1/doc/vimrc.trash mutt-1.6.1-trash/doc/vimrc.trash
--- mutt-1.6.1/doc/vimrc.trash 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-trash/doc/vimrc.trash 2016-05-02 03:02:15.863226530 +0100
++++ mutt-1.6.1-trash/doc/vimrc.trash 2016-05-30 14:49:25.023741291 +0100
@@ -0,0 +1,7 @@
+" Vim syntax file for the mutt trash patch
+
@@ -276,8 +293,8 @@ diff -urN mutt-1.6.1/doc/vimrc.trash mutt-1.6.1-trash/doc/vimrc.trash
+
+" vim: syntax=vim
diff -urN mutt-1.6.1/flags.c mutt-1.6.1-trash/flags.c
---- mutt-1.6.1/flags.c 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-trash/flags.c 2016-05-02 03:02:15.956228010 +0100
+--- mutt-1.6.1/flags.c 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-trash/flags.c 2016-05-30 14:49:25.111742667 +0100
@@ -65,7 +65,13 @@
{
h->deleted = 0;
@@ -322,8 +339,8 @@ diff -urN mutt-1.6.1/flags.c mutt-1.6.1-trash/flags.c
if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
diff -urN mutt-1.6.1/functions.h mutt-1.6.1-trash/functions.h
---- mutt-1.6.1/functions.h 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-trash/functions.h 2016-05-02 03:02:15.956228010 +0100
+--- mutt-1.6.1/functions.h 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-trash/functions.h 2016-05-30 14:49:25.111742667 +0100
@@ -121,6 +121,7 @@
{ "toggle-write", OP_TOGGLE_WRITE, "%" },
{ "next-thread", OP_MAIN_NEXT_THREAD, "\016" },
@@ -341,8 +358,8 @@ diff -urN mutt-1.6.1/functions.h mutt-1.6.1-trash/functions.h
{ "exit", OP_EXIT, "q" },
{ "reply", OP_REPLY, "r" },
diff -urN mutt-1.6.1/globals.h mutt-1.6.1-trash/globals.h
---- mutt-1.6.1/globals.h 2016-05-02 03:02:12.403171480 +0100
-+++ mutt-1.6.1-trash/globals.h 2016-05-02 03:02:15.956228010 +0100
+--- mutt-1.6.1/globals.h 2016-05-30 14:49:21.090679800 +0100
++++ mutt-1.6.1-trash/globals.h 2016-05-30 14:49:25.112742683 +0100
@@ -141,6 +141,7 @@
WHERE char *Status;
WHERE char *Tempdir;
@@ -352,8 +369,8 @@ diff -urN mutt-1.6.1/globals.h mutt-1.6.1-trash/globals.h
WHERE char *TSIconFormat;
WHERE short TSSupported;
diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-trash/imap/imap.c
---- mutt-1.6.1/imap/imap.c 2016-05-02 03:02:12.404171496 +0100
-+++ mutt-1.6.1-trash/imap/imap.c 2016-05-02 03:02:15.957228026 +0100
+--- mutt-1.6.1/imap/imap.c 2016-05-30 14:49:21.092679831 +0100
++++ mutt-1.6.1-trash/imap/imap.c 2016-05-30 14:49:25.113742698 +0100
@@ -888,6 +888,12 @@
if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted)
match = invert ^ hdrs[n]->deleted;
@@ -422,8 +439,8 @@ diff -urN mutt-1.6.1/imap/imap.c mutt-1.6.1-trash/imap/imap.c
+ return 1;
+}
diff -urN mutt-1.6.1/imap/imap.h mutt-1.6.1-trash/imap/imap.h
---- mutt-1.6.1/imap/imap.h 2016-05-02 03:02:12.404171496 +0100
-+++ mutt-1.6.1-trash/imap/imap.h 2016-05-02 03:02:15.867226594 +0100
+--- mutt-1.6.1/imap/imap.h 2016-05-30 14:49:21.092679831 +0100
++++ mutt-1.6.1-trash/imap/imap.h 2016-05-30 14:49:25.028741370 +0100
@@ -72,4 +72,7 @@
int imap_account_match (const ACCOUNT* a1, const ACCOUNT* a2);
@@ -433,8 +450,8 @@ diff -urN mutt-1.6.1/imap/imap.h mutt-1.6.1-trash/imap/imap.h
+
#endif
diff -urN mutt-1.6.1/imap/message.c mutt-1.6.1-trash/imap/message.c
---- mutt-1.6.1/imap/message.c 2016-05-02 03:02:12.405171512 +0100
-+++ mutt-1.6.1-trash/imap/message.c 2016-05-02 03:02:15.867226594 +0100
+--- mutt-1.6.1/imap/message.c 2016-05-30 14:49:21.093679847 +0100
++++ mutt-1.6.1-trash/imap/message.c 2016-05-30 14:49:25.113742698 +0100
@@ -886,6 +886,7 @@
if (ctx->hdrs[n]->tagged)
{
@@ -452,8 +469,8 @@ diff -urN mutt-1.6.1/imap/message.c mutt-1.6.1-trash/imap/message.c
mutt_set_flag (ctx, h, M_TAG, 0);
}
diff -urN mutt-1.6.1/init.h mutt-1.6.1-trash/init.h
---- mutt-1.6.1/init.h 2016-05-02 03:02:12.407171544 +0100
-+++ mutt-1.6.1-trash/init.h 2016-05-02 03:02:15.960228073 +0100
+--- mutt-1.6.1/init.h 2016-05-30 14:49:21.095679878 +0100
++++ mutt-1.6.1-trash/init.h 2016-05-30 14:49:25.116742745 +0100
@@ -3419,6 +3419,16 @@
** provided that ``$$ts_enabled'' has been set. This string is identical in
** formatting to the one used by ``$$status_format''.
@@ -472,8 +489,8 @@ diff -urN mutt-1.6.1/init.h mutt-1.6.1-trash/init.h
{ "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
/*
diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-trash/mutt.h
---- mutt-1.6.1/mutt.h 2016-05-02 03:02:12.409171576 +0100
-+++ mutt-1.6.1-trash/mutt.h 2016-05-02 03:02:15.961228089 +0100
+--- mutt-1.6.1/mutt.h 2016-05-30 14:49:21.098679925 +0100
++++ mutt-1.6.1-trash/mutt.h 2016-05-30 14:49:25.118742777 +0100
@@ -182,6 +182,8 @@
M_DELETE,
M_UNDELETE,
@@ -501,8 +518,8 @@ diff -urN mutt-1.6.1/mutt.h mutt-1.6.1-trash/mutt.h
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-trash/muttlib.c
---- mutt-1.6.1/muttlib.c 2016-05-02 03:02:12.410171592 +0100
-+++ mutt-1.6.1-trash/muttlib.c 2016-05-02 03:02:15.962228105 +0100
+--- mutt-1.6.1/muttlib.c 2016-05-30 14:49:21.099679941 +0100
++++ mutt-1.6.1-trash/muttlib.c 2016-05-30 14:49:25.119742792 +0100
@@ -1511,7 +1511,9 @@
if (magic > 0 && !mx_access (s, W_OK))
@@ -515,8 +532,8 @@ diff -urN mutt-1.6.1/muttlib.c mutt-1.6.1-trash/muttlib.c
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
diff -urN mutt-1.6.1/mx.c mutt-1.6.1-trash/mx.c
---- mutt-1.6.1/mx.c 2016-05-02 03:02:12.410171592 +0100
-+++ mutt-1.6.1-trash/mx.c 2016-05-02 03:02:15.962228105 +0100
+--- mutt-1.6.1/mx.c 2016-05-30 14:49:21.099679941 +0100
++++ mutt-1.6.1-trash/mx.c 2016-05-30 14:49:25.119742792 +0100
@@ -776,6 +776,62 @@
return rc;
}
@@ -617,8 +634,8 @@ diff -urN mutt-1.6.1/mx.c mutt-1.6.1-trash/mx.c
if (ctx->magic == M_IMAP)
rc = imap_sync_mailbox (ctx, purge, index_hint);
diff -urN mutt-1.6.1/OPS mutt-1.6.1-trash/OPS
---- mutt-1.6.1/OPS 2016-05-02 03:02:12.392171305 +0100
-+++ mutt-1.6.1-trash/OPS 2016-05-02 03:02:15.945227835 +0100
+--- mutt-1.6.1/OPS 2016-05-30 14:49:21.076679581 +0100
++++ mutt-1.6.1-trash/OPS 2016-05-30 14:49:25.100742495 +0100
@@ -142,6 +142,7 @@
OP_PREV_LINE "scroll up one line"
OP_PREV_PAGE "move to the previous page"
@@ -628,8 +645,8 @@ diff -urN mutt-1.6.1/OPS mutt-1.6.1-trash/OPS
OP_QUERY_APPEND "append new query results to current results"
OP_QUIT "save changes to mailbox and quit"
diff -urN mutt-1.6.1/pager.c mutt-1.6.1-trash/pager.c
---- mutt-1.6.1/pager.c 2016-05-02 03:02:12.411171608 +0100
-+++ mutt-1.6.1-trash/pager.c 2016-05-02 03:02:15.963228121 +0100
+--- mutt-1.6.1/pager.c 2016-05-30 14:49:21.100679956 +0100
++++ mutt-1.6.1-trash/pager.c 2016-05-30 14:49:25.120742808 +0100
@@ -2351,6 +2351,7 @@
MAYBE_REDRAW (redraw);
break;
@@ -669,13 +686,13 @@ diff -urN mutt-1.6.1/pager.c mutt-1.6.1-trash/pager.c
if (option (OPTRESOLVE))
{
diff -urN mutt-1.6.1/PATCHES mutt-1.6.1-trash/PATCHES
---- mutt-1.6.1/PATCHES 2016-05-02 03:02:12.396171369 +0100
-+++ mutt-1.6.1-trash/PATCHES 2016-05-02 03:02:15.949227898 +0100
+--- mutt-1.6.1/PATCHES 2016-05-30 14:49:21.081679659 +0100
++++ mutt-1.6.1-trash/PATCHES 2016-05-30 14:49:25.105742573 +0100
@@ -0,0 +1 @@
-+patch-trash-neo-20160502
++patch-trash-neo-20160530
diff -urN mutt-1.6.1/pattern.c mutt-1.6.1-trash/pattern.c
---- mutt-1.6.1/pattern.c 2016-05-02 03:02:12.411171608 +0100
-+++ mutt-1.6.1-trash/pattern.c 2016-05-02 03:02:15.963228121 +0100
+--- mutt-1.6.1/pattern.c 2016-05-30 14:49:21.100679956 +0100
++++ mutt-1.6.1-trash/pattern.c 2016-05-30 14:49:25.120742808 +0100
@@ -1367,8 +1367,9 @@
{
switch (op)
@@ -688,8 +705,8 @@ diff -urN mutt-1.6.1/pattern.c mutt-1.6.1-trash/pattern.c
(op == M_DELETE));
break;
diff -urN mutt-1.6.1/postpone.c mutt-1.6.1-trash/postpone.c
---- mutt-1.6.1/postpone.c 2016-05-02 03:02:12.411171608 +0100
-+++ mutt-1.6.1-trash/postpone.c 2016-05-02 03:02:15.905227198 +0100
+--- mutt-1.6.1/postpone.c 2016-05-30 14:49:21.102679988 +0100
++++ mutt-1.6.1-trash/postpone.c 2016-05-30 14:49:25.122742839 +0100
@@ -277,6 +277,9 @@
/* finished with this message, so delete it. */
mutt_set_flag (PostContext, h, M_DELETE, 1);
@@ -702,7 +719,7 @@ diff -urN mutt-1.6.1/postpone.c mutt-1.6.1-trash/postpone.c
diff -urN mutt-1.6.1/README.trash mutt-1.6.1-trash/README.trash
--- mutt-1.6.1/README.trash 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.6.1-trash/README.trash 2016-05-02 03:02:15.949227898 +0100
++++ mutt-1.6.1-trash/README.trash 2016-05-30 14:49:25.008741057 +0100
@@ -0,0 +1,74 @@
+Trash Folder Patch
+==================
@@ -718,7 +735,7 @@ diff -urN mutt-1.6.1/README.trash mutt-1.6.1-trash/README.trash
+ If IMAP is enabled, this patch will use it
+
+ Dependencies
-+ * mutt-1.5.24
++ * mutt-1.6.1
+ * IMAP support
+
+Introduction