[143204] trunk/dports/mail/mutt-devel

cal at macports.org cal at macports.org
Sat Dec 12 08:59:50 PST 2015


Revision: 143204
          https://trac.macports.org/changeset/143204
Author:   cal at macports.org
Date:     2015-12-07 09:55:50 -0800 (Mon, 07 Dec 2015)
Log Message:
-----------
mutt-devel: update to 1.5.24

Delete unused patches and remove patch files that have been integrated
upstream. Add Upstream-Status to some patches.

Those are:
 - patch-1.5.20.crypt.c.diff: fixed upstream http://dev.mutt.org/trac/ticket/3639
 - patch-thunderbird-fix.diff: add upstream reference http://dev.mutt.org/trac/ticket/3285
 - patch-smime_keys.diff: fixed upstream http://dev.mutt.org/trac/ticket/3339, http://dev.mutt.org/trac/ticket/3559
 - patch-1.5.20.gpgme.diff: fixed upstream http://dev.mutt.org/trac/ticket/3300
 - patch-1.5.23.sidebar.20140412.diff: deleted, now downloaded directly from http://www.lunar-linux.org/mutt-sidebar/
 - all other patches: unused

Modified Paths:
--------------
    trunk/dports/mail/mutt-devel/Portfile
    trunk/dports/mail/mutt-devel/files/patch-thunderbird-fix.diff

Removed Paths:
-------------
    trunk/dports/mail/mutt-devel/files/patch-1.5.17.cd.purge_message.bk.1.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.purge_message.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.trash_folder.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.crypt.c.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff
    trunk/dports/mail/mutt-devel/files/patch-1.5.23.sidebar.20140412.diff
    trunk/dports/mail/mutt-devel/files/patch-compress-1.5.20.diff
    trunk/dports/mail/mutt-devel/files/patch-smime_keys.diff
    trunk/dports/mail/mutt-devel/files/patch-trash-1.5.16.diff

Modified: trunk/dports/mail/mutt-devel/Portfile
===================================================================
--- trunk/dports/mail/mutt-devel/Portfile	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/Portfile	2015-12-07 17:55:50 UTC (rev 143204)
@@ -5,8 +5,7 @@
 
 name                mutt-devel
 conflicts           mutt
-version             1.5.23
-revision            4
+version             1.5.24
 categories          mail
 platforms           darwin
 license             GPL-2
@@ -31,18 +30,13 @@
 master_sites        https://bitbucket.org/mutt/mutt/downloads/
 distname            mutt-${version}
 checksums           ${distfiles} \
-                        md5     11f5b6a3eeba1afa1257fe93c9f26bff \
-                        sha1    8ac821d8b1e25504a31bf5fda9c08d93a4acc862 \
-                        rmd160  2476a9e202ab1cd20a512253246e37538e0aad5a
+                    rmd160  7fe7e653c27c9b580f958493638c1248d0ad5591 \
+                    sha256  a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
 
-patch.args          -p1
-# Fix handling of smime
-# http://dev.mutt.org/trac/ticket/3639
-patchfiles-append   patch-1.5.20.crypt.c.diff
+patch.pre_args      -p1
 # Fix for handling emails from bad clients w.r.t smime
+# See https://trac.macports.org/ticket/39362 and http://dev.mutt.org/trac/ticket/3285
 patchfiles-append   patch-thunderbird-fix.diff
-# Fix smime_keys
-patchfiles-append   patch-smime_keys.diff
 
 
 configure.args      --disable-warnings \
@@ -100,10 +94,11 @@
 
 variant compress description {Compressed folders} {
     configure.args-append   --enable-compressed
-    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.23/
-    patchfiles-append       patch-1.5.23.rr.compressed.gz
-    checksums-append        patch-1.5.23.rr.compressed.gz \
-                                md5 ff4af5d5b91d58930d06edcea3c34936
+    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.24/
+    patchfiles-append       patch-1.5.24.rr.compressed.gz
+    checksums-append        patch-1.5.24.rr.compressed.gz \
+                            rmd160  2bf71a26de195ce11ed4ffa25403363cab7c9b72 \
+                            sha256  c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc
 }
 
 variant headercache conflicts db4 description {Enable header caching (requires gdbm, qdbm, or tokyocabinet)} {
@@ -148,27 +143,21 @@
 # The patches for nntp and sidebar conflict, see ticket #15135
 variant nntp conflicts sidebar description {NNTP support} {
     configure.args-append   --enable-nntp
-    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.21/
-    patchfiles-append       patch-1.5.21.vvv.nntp.gz
-    checksums-append        patch-1.5.21.vvv.nntp.gz \
-                                md5 afcf40f7e53a016b953cbf6af27b3cd8
+    patch_sites-append      http://www.mutt.org.ua/download/mutt-1.5.24/
+    patchfiles-append       patch-1.5.24.vvv.nntp.gz
+    checksums-append        patch-1.5.24.vvv.nntp.gz \
+                            rmd160  028b86c3864ec2b8a485b998ce42d55fbb98e205 \
+                            sha256  d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e
 }
 
 variant deepif description {Allow nested if-else sequences in strings} {
     patch_sites-append      http://home.uchicago.edu/~dgc/sw/mutt/
     patchfiles-append       patch-1.5.8.dgc.deepif.1
     checksums-append        patch-1.5.8.dgc.deepif.1 \
-                                md5 b892597eff7b60c450b48c011ab941cb
+                            rmd160  9372934147e8b832390c45833d0b8ce6c704dd24 \
+                            sha256  570c343a440f5957e8e4639bda598c861cfaeae065a380a2c01ccb17d373ce6b
 }
 
-# whoa! messy FAIL
-#variant unbind description {Undo stroke and macro bindings} {
-#    patch_sites-append      http://home.uchicago.edu/~dgc/sw/mutt/
-#    patchfiles-append       patch-1.5.6.dgc.unbind.1
-#    checksums-append        patch-1.5.6.dgc.unbind.1 md5 \
-#                                47a1f47382b33f4cc5ce89de1cfea4e1
-#}
-
 variant date_conditional requires deepif description \
     {Allow the format of dates in the index to vary based on how recent the message is} {
     # original, but now dgc hosts it with -p1
@@ -176,31 +165,29 @@
     patch_sites-append      http://home.uchicago.edu/~dgc/sw/mutt/
     patchfiles-append       patch-1.5.8.ats.date_conditional.1
     checksums-append        patch-1.5.8.ats.date_conditional.1 \
-                                md5 83479a011390802b3f9f1c0f95b15199
+                            rmd160  fc3703edc66b5043227a7abcfed10a9c44873fd0 \
+                            sha256  9e81f9f52577eb572e29651402ded3690e470d1628a890af9f3ad25b665d600f
 }
 
 variant xlabel description {Custom message-tagging - X-Label:} {
     patchfiles-append       patch-1.5.21.mp.xlabel_ext.9
 }
 
-# patch_site appears to be dead, can re-enable the variant if a working one is found
-#variant checkseen {
-#    patch_sites-append      http://www.neuronix.cz/coding/mutt_imap/
-#    patchfiles-append       imap_checkseen_1.5.11.patch
-#    checksums-append        imap_checkseen_1.5.11.patch md5 \
-#                                37e49d7203149027e30e28a7bc74c365
-#}
-
 variant smtp description {Include internal SMTP relay support} {
     configure.args-append   --enable-smtp
 }
 
-variant sidebar conflicts nntp description {Add a sidebar with a list of folders} {
-    # http://www.lunar-linux.org/index.php/en/component/content/article/44-mutt-sidebar.html
-    patchfiles-append       patch-1.5.23.sidebar.20140412.diff
+variant sidebar conflicts nntp trash description {Add a sidebar with a list of folders} {
+    # http://www.lunar-linux.org/mutt-sidebar/
+    patch_sites-append      http://lunar-linux.org/~tchan/mutt:sidebar-patch
+    patchfiles-append       patch-1.5.24.sidebar.20151111.txt:sidebar-patch
+    checksums-append        patch-1.5.24.sidebar.20151111.txt \
+                            rmd160  521938ab47440e93f73bc5ae358e867ab3d3212c \
+                            sha256  66441edf056032119f854fc5ee86c73eece8b95dc998c0cfae5ed05b0b035070
 }
 
-variant trash description {Add a Trash folder} {
+# Trash patch from https://trac.macports.org/ticket/20412 conflicts with sidebar patch on global.h
+variant trash conflicts sidebar description {Add a Trash folder} {
     patchfiles-append       patch-1.5.20.bk.trash_folder-purge_message.1
 }
 
@@ -208,13 +195,6 @@
     configure.args-append   --enable-gpgme \
                             --with-gpgme-prefix=${prefix}
     depends_lib-append      port:gpgme
-
-    # the following patch makes mutt 1.5.20 compatible with gpgme 1.2.0, 
-    # cf. http://bugs.gentoo.org/show_bug.cgi?id=278394
-    # and http://dev.mutt.org/trac/ticket/3300
-    patchfiles-append       patch-1.5.20.gpgme.diff
-    checksums-append        patch-1.5.20.gpgme.diff \
-                                md5 6faa84e2520dad7c603e8a8b9e0a9b30
 }
 
 notes "This port no longer installs the pgpring binary. Please install the signing-party port if you need it."

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.17.cd.purge_message.bk.1.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.17.cd.purge_message.bk.1.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.17.cd.purge_message.bk.1.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,197 +0,0 @@
-diff -pruN mutt-1.5.17/OPS mutt-1.5.17-purge/OPS
---- mutt-1.5.17/OPS	2007-05-07 14:46:12.000000000 -0400
-+++ mutt-1.5.17-purge/OPS	2007-12-21 19:52:37.000000000 -0500
-@@ -141,6 +141,7 @@ OP_PREV_ENTRY "move to the previous entr
- OP_PREV_LINE "scroll up one line"
- OP_PREV_PAGE "move to the previous page"
- OP_PRINT "print the current entry"
-+OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"
- OP_QUERY "query external program for addresses"
- OP_QUERY_APPEND "append new query results to current results"
- OP_QUIT "save changes to mailbox and quit"
-diff -pruN mutt-1.5.17/PATCHES mutt-1.5.17-purge/PATCHES
---- mutt-1.5.17/PATCHES	2007-12-21 19:45:26.000000000 -0500
-+++ mutt-1.5.17-purge/PATCHES	2007-12-21 19:52:37.000000000 -0500
-@@ -1 +1,2 @@
- patch-1.5.16hg.cd.trash_folder.vl.1
-+patch-1.5.17.cd.purge_message.bk.1
-diff -pruN mutt-1.5.17/curs_main.c mutt-1.5.17-purge/curs_main.c
---- mutt-1.5.17/curs_main.c	2007-05-28 19:19:50.000000000 -0400
-+++ mutt-1.5.17-purge/curs_main.c	2007-12-21 19:52:37.000000000 -0500
-@@ -1799,6 +1799,7 @@ int mutt_index_menu (void)
- 	MAYBE_REDRAW (menu->redraw);
- 	break;
- 
-+      case OP_PURGE_MESSAGE:
-       case OP_DELETE:
- 
- 	CHECK_MSGCOUNT;
-@@ -1809,6 +1810,7 @@ int mutt_index_menu (void)
- 	if (tag)
- 	{
- 	  mutt_tag_set_flag (M_DELETE, 1);
-+	  mutt_tag_set_flag (M_PURGED, (op != OP_PURGE_MESSAGE) ? 0 : 1);
- 	  if (option (OPTDELETEUNTAG))
- 	    mutt_tag_set_flag (M_TAG, 0);
- 	  menu->redraw = REDRAW_INDEX;
-@@ -1816,6 +1818,8 @@ int mutt_index_menu (void)
- 	else
- 	{
- 	  mutt_set_flag (Context, CURHDR, M_DELETE, 1);
-+	  mutt_set_flag (Context, CURHDR, M_PURGED,
-+			 (op != OP_PURGE_MESSAGE) ? 0 : 1);
- 	  if (option (OPTDELETEUNTAG))
- 	    mutt_set_flag (Context, CURHDR, M_TAG, 0);
- 	  if (option (OPTRESOLVE))
-@@ -2112,11 +2116,13 @@ int mutt_index_menu (void)
- 	if (tag)
- 	{
- 	  mutt_tag_set_flag (M_DELETE, 0);
-+	  mutt_tag_set_flag (M_PURGED, 0);
- 	  menu->redraw = REDRAW_INDEX;
- 	}
- 	else
- 	{
- 	  mutt_set_flag (Context, CURHDR, M_DELETE, 0);
-+	  mutt_set_flag (Context, CURHDR, M_PURGED, 0);
- 	  if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)
- 	  {
- 	    menu->current++;
-@@ -2137,9 +2143,11 @@ int mutt_index_menu (void)
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
- 
- 	rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,
--				   op == OP_UNDELETE_THREAD ? 0 : 1);
-+				   op == OP_UNDELETE_THREAD ? 0 : 1)
-+	  + mutt_thread_set_flag (CURHDR, M_PURGED, 0,
-+				  op == OP_UNDELETE_THREAD ? 0 : 1);
- 
--	if (rc != -1)
-+	if (rc > -1)
- 	{
- 	  if (option (OPTRESOLVE))
- 	  {
-diff -pruN mutt-1.5.17/flags.c mutt-1.5.17-purge/flags.c
---- mutt-1.5.17/flags.c	2007-12-21 19:45:26.000000000 -0500
-+++ mutt-1.5.17-purge/flags.c	2007-12-21 19:52:37.000000000 -0500
-@@ -108,6 +108,16 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
-       }
-       break;
- 
-+    case M_PURGED:
-+      if (bf)
-+      {
-+	if (!h->purged)
-+	  h->purged = 1;
-+      }
-+      else if (h->purged)
-+	h->purged = 0;
-+      break;
-+
-     case M_NEW:
- 
-       if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-diff -pruN mutt-1.5.17/functions.h mutt-1.5.17-purge/functions.h
---- mutt-1.5.17/functions.h	2007-05-07 14:45:34.000000000 -0400
-+++ mutt-1.5.17-purge/functions.h	2007-12-21 19:52:37.000000000 -0500
-@@ -120,6 +120,7 @@ struct binding_t OpMain[] = { /* map: in
-   { "toggle-write",		OP_TOGGLE_WRITE,		"%" },
-   { "next-thread",		OP_MAIN_NEXT_THREAD,		"\016" },
-   { "next-subthread",		OP_MAIN_NEXT_SUBTHREAD,		"\033n" },
-+  { "purge-message",		OP_PURGE_MESSAGE,		NULL },
-   { "query",			OP_QUERY,			"Q" },
-   { "quit",			OP_QUIT,			"q" },
-   { "reply",			OP_REPLY,			"r" },
-@@ -207,6 +208,7 @@ struct binding_t OpPager[] = { /* map: p
-   { "print-message",	OP_PRINT,			"p" },
-   { "previous-thread",	OP_MAIN_PREV_THREAD,		"\020" },
-   { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,	"\033p" },
-+  { "purge-message",	OP_PURGE_MESSAGE,		NULL },
-   { "quit",		OP_QUIT,			"Q" },
-   { "exit",		OP_EXIT,			"q" },
-   { "reply",		OP_REPLY,			"r" },
-diff -pruN mutt-1.5.17/mutt.h mutt-1.5.17-purge/mutt.h
---- mutt-1.5.17/mutt.h	2007-12-21 19:45:26.000000000 -0500
-+++ mutt-1.5.17-purge/mutt.h	2007-12-21 19:52:37.000000000 -0500
-@@ -202,6 +202,7 @@ enum
-   M_UNDELETE,
-   M_DELETED,
-   M_APPENDED,
-+  M_PURGED,
-   M_FLAG,
-   M_TAG,
-   M_UNTAG,
-@@ -713,6 +714,7 @@ typedef struct header
-   unsigned int flagged : 1; 		/* marked important? */
-   unsigned int tagged : 1;
-   unsigned int appended : 1; /* has been saved */
-+  unsigned int purged : 1;   /* bypassing the trash folder */
-   unsigned int deleted : 1;
-   unsigned int changed : 1;
-   unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
-diff -pruN mutt-1.5.17/mx.c mutt-1.5.17-purge/mx.c
---- mutt-1.5.17/mx.c	2007-12-21 19:45:26.000000000 -0500
-+++ mutt-1.5.17-purge/mx.c	2007-12-21 19:53:07.000000000 -0500
-@@ -833,6 +833,7 @@ static int trash_append (CONTEXT *ctx)
-     {
-       for (i = 0 ; i < ctx->msgcount ; i++)
-        if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
-+           && !ctx->hdrs[i]->purged
-            && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
-          {
-            mx_close_mailbox (ctx_trash, NULL);
-diff -pruN mutt-1.5.17/pager.c mutt-1.5.17-purge/pager.c
---- mutt-1.5.17/pager.c	2007-09-05 14:28:05.000000000 -0400
-+++ mutt-1.5.17-purge/pager.c	2007-12-21 19:52:37.000000000 -0500
-@@ -2256,12 +2256,15 @@ search_next:
- 	MAYBE_REDRAW (redraw);
- 	break;
- 
-+      case OP_PURGE_MESSAGE:
-       case OP_DELETE:
- 	CHECK_MODE(IsHeader (extra));
- 	CHECK_READONLY;
- 	CHECK_ACL(M_ACL_DELETE, _("delete message"));
- 
- 	mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
-+	mutt_set_flag (Context, extra->hdr, M_PURGED,
-+		       ch != OP_PURGE_MESSAGE ? 0 : 1);
-         if (option (OPTDELETEUNTAG))
- 	  mutt_set_flag (Context, extra->hdr, M_TAG, 0);
- 	redraw = REDRAW_STATUS | REDRAW_INDEX;
-@@ -2574,6 +2577,7 @@ search_next:
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message"));
- 
- 	mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
-+	mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
- 	redraw = REDRAW_STATUS | REDRAW_INDEX;
- 	if (option (OPTRESOLVE))
- 	{
-@@ -2589,9 +2593,11 @@ search_next:
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
- 
- 	r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
-+				  ch == OP_UNDELETE_THREAD ? 0 : 1)
-+	  + mutt_thread_set_flag (extra->hdr, M_PURGED, 0,
- 				  ch == OP_UNDELETE_THREAD ? 0 : 1);
- 
--	if (r != -1)
-+	if (r > -1)
- 	{
- 	  if (option (OPTRESOLVE))
- 	  {
-diff -pruN mutt-1.5.17/pattern.c mutt-1.5.17-purge/pattern.c
---- mutt-1.5.17/pattern.c	2007-09-05 14:28:05.000000000 -0400
-+++ mutt-1.5.17-purge/pattern.c	2007-12-21 19:52:37.000000000 -0500
-@@ -1344,8 +1344,10 @@ int mutt_pattern_func (int op, char *pro
-       {
- 	switch (op)
- 	{
--	  case M_DELETE:
- 	  case M_UNDELETE:
-+	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_PURGED,
-+			   0);
-+	  case M_DELETE:
- 	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_DELETE, 
- 			  (op == M_DELETE));
- 	    break;

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.purge_message.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.purge_message.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.purge_message.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,197 +0,0 @@
-diff -u mutt-1.5.20-trashfolder/OPS mutt-1.5.20-trash+purge/OPS
---- mutt-1.5.20-trashfolder/OPS	2009-05-12 22:01:13.000000000 -0700
-+++ mutt-1.5.20-trash+purge/OPS	2009-09-06 06:58:12.000000000 -0700
-@@ -141,6 +141,7 @@
- OP_PREV_LINE "scroll up one line"
- OP_PREV_PAGE "move to the previous page"
- OP_PRINT "print the current entry"
-+OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"
- OP_QUERY "query external program for addresses"
- OP_QUERY_APPEND "append new query results to current results"
- OP_QUIT "save changes to mailbox and quit"
-Common subdirectories: mutt-1.5.20-trashfolder/contrib and mutt-1.5.20-trash+purge/contrib
-diff -u mutt-1.5.20-trashfolder/curs_main.c mutt-1.5.20-trash+purge/curs_main.c
---- mutt-1.5.20-trashfolder/curs_main.c	2009-06-13 19:48:36.000000000 -0700
-+++ mutt-1.5.20-trash+purge/curs_main.c	2009-09-06 07:09:07.000000000 -0700
-@@ -1803,6 +1803,7 @@
- 	MAYBE_REDRAW (menu->redraw);
- 	break;
- 
-+      case OP_PURGE_MESSAGE:
-       case OP_DELETE:
- 
- 	CHECK_MSGCOUNT;
-@@ -1813,6 +1814,7 @@
- 	if (tag)
- 	{
- 	  mutt_tag_set_flag (M_DELETE, 1);
-+	  mutt_tag_set_flag (M_PURGED, (op != OP_PURGE_MESSAGE) ? 0 : 1);
- 	  if (option (OPTDELETEUNTAG))
- 	    mutt_tag_set_flag (M_TAG, 0);
- 	  menu->redraw = REDRAW_INDEX;
-@@ -1820,6 +1822,8 @@
- 	else
- 	{
- 	  mutt_set_flag (Context, CURHDR, M_DELETE, 1);
-+	  mutt_set_flag (Context, CURHDR, M_PURGED,
-+			  (op != OP_PURGE_MESSAGE) ? 0 : 1);
- 	  if (option (OPTDELETEUNTAG))
- 	    mutt_set_flag (Context, CURHDR, M_TAG, 0);
- 	  if (option (OPTRESOLVE))
-@@ -2116,11 +2120,13 @@
- 	if (tag)
- 	{
- 	  mutt_tag_set_flag (M_DELETE, 0);
-+	  mutt_tag_set_flag (M_PURGED, 0);
- 	  menu->redraw = REDRAW_INDEX;
- 	}
- 	else
- 	{
- 	  mutt_set_flag (Context, CURHDR, M_DELETE, 0);
-+	  mutt_set_flag (Context, CURHDR, M_PURGED, 0);
- 	  if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)
- 	  {
- 	    menu->current++;
-@@ -2141,9 +2147,11 @@
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
- 
- 	rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,
--				   op == OP_UNDELETE_THREAD ? 0 : 1);
-+			op == OP_UNDELETE_THREAD ? 0 : 1)
-+		+ mutt_thread_set_flag (CURHDR, M_PURGED, 0,
-+				op == OP_UNDELETE_THREAD ? 0 : 1);
- 
--	if (rc != -1)
-+	if (rc > -1)
- 	{
- 	  if (option (OPTRESOLVE))
- 	  {
-Common subdirectories: mutt-1.5.20-trashfolder/doc and mutt-1.5.20-trash+purge/doc
-diff -u mutt-1.5.20-trashfolder/flags.c mutt-1.5.20-trash+purge/flags.c
---- mutt-1.5.20-trashfolder/flags.c	2009-09-06 06:54:10.000000000 -0700
-+++ mutt-1.5.20-trash+purge/flags.c	2009-09-06 07:11:28.000000000 -0700
-@@ -104,6 +104,16 @@
-       }
-       break;
- 
-+    case M_PURGED:
-+      if (bf)
-+      {
-+	if (!h->purged)
-+	  h->purged = 1;
-+      }
-+      else if (h->purged)
-+	h->purged = 0;
-+      break;
-+
-     case M_NEW:
- 
-       if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-diff -u mutt-1.5.20-trashfolder/functions.h mutt-1.5.20-trash+purge/functions.h
---- mutt-1.5.20-trashfolder/functions.h	2009-04-29 22:36:17.000000000 -0700
-+++ mutt-1.5.20-trash+purge/functions.h	2009-09-06 07:13:40.000000000 -0700
-@@ -120,6 +120,7 @@
-   { "toggle-write",		OP_TOGGLE_WRITE,		"%" },
-   { "next-thread",		OP_MAIN_NEXT_THREAD,		"\016" },
-   { "next-subthread",		OP_MAIN_NEXT_SUBTHREAD,		"\033n" },
-+  { "purge-message",		OP_PURGE_MESSAGE,		NULL },
-   { "query",			OP_QUERY,			"Q" },
-   { "quit",			OP_QUIT,			"q" },
-   { "reply",			OP_REPLY,			"r" },
-@@ -209,6 +210,7 @@
-   { "print-message",	OP_PRINT,			"p" },
-   { "previous-thread",	OP_MAIN_PREV_THREAD,		"\020" },
-   { "previous-subthread",OP_MAIN_PREV_SUBTHREAD,	"\033p" },
-+  { "purge-message",	OP_PURGE_MESSAGE,		NULL },
-   { "quit",		OP_QUIT,			"Q" },
-   { "exit",		OP_EXIT,			"q" },
-   { "reply",		OP_REPLY,			"r" },
-Common subdirectories: mutt-1.5.20-trashfolder/imap and mutt-1.5.20-trash+purge/imap
-Common subdirectories: mutt-1.5.20-trashfolder/intl and mutt-1.5.20-trash+purge/intl
-Common subdirectories: mutt-1.5.20-trashfolder/m4 and mutt-1.5.20-trash+purge/m4
-diff -u mutt-1.5.20-trashfolder/mutt.h mutt-1.5.20-trash+purge/mutt.h
---- mutt-1.5.20-trashfolder/mutt.h	2009-09-06 06:54:10.000000000 -0700
-+++ mutt-1.5.20-trash+purge/mutt.h	2009-09-06 07:15:06.000000000 -0700
-@@ -188,6 +188,7 @@
-   M_UNDELETE,
-   M_DELETED,
-   M_APPENDED,
-+  M_PURGED,
-   M_FLAG,
-   M_TAG,
-   M_UNTAG,
-@@ -704,6 +705,7 @@
-   unsigned int tagged : 1;
-   unsigned int deleted : 1;
-   unsigned int appended : 1;            /* has been saved */
-+  unsigned int purged : 1;		/* bypassing the trash folder */
-   unsigned int changed : 1;
-   unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
-   unsigned int old : 1;
-diff -u mutt-1.5.20-trashfolder/mx.c mutt-1.5.20-trash+purge/mx.c
---- mutt-1.5.20-trashfolder/mx.c	2009-09-06 06:54:10.000000000 -0700
-+++ mutt-1.5.20-trash+purge/mx.c	2009-09-06 07:17:46.000000000 -0700
-@@ -803,6 +803,7 @@
-     {
-       for (i = 0 ; i < ctx->msgcount ; i++)
- 	if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
-+	    && !ctx->hdrs[i]->purged
- 	    && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
- 	  {
- 	    mx_close_mailbox (ctx_trash, NULL);
-diff -u mutt-1.5.20-trashfolder/pager.c mutt-1.5.20-trash+purge/pager.c
---- mutt-1.5.20-trashfolder/pager.c	2009-06-03 13:48:31.000000000 -0700
-+++ mutt-1.5.20-trash+purge/pager.c	2009-09-06 07:23:05.000000000 -0700
-@@ -2309,12 +2309,15 @@
- 	MAYBE_REDRAW (redraw);
- 	break;
- 
-+      case OP_PURGE_MESSAGE:
-       case OP_DELETE:
- 	CHECK_MODE(IsHeader (extra));
- 	CHECK_READONLY;
- 	CHECK_ACL(M_ACL_DELETE, _("delete message"));
- 
- 	mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
-+	mutt_set_flag (Context, extra->hdr, M_PURGED,
-+			ch != OP_PURGE_MESSAGE ? 0 : 1);
-         if (option (OPTDELETEUNTAG))
- 	  mutt_set_flag (Context, extra->hdr, M_TAG, 0);
- 	redraw = REDRAW_STATUS | REDRAW_INDEX;
-@@ -2641,6 +2644,7 @@
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message"));
- 
- 	mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
-+	mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
- 	redraw = REDRAW_STATUS | REDRAW_INDEX;
- 	if (option (OPTRESOLVE))
- 	{
-@@ -2656,9 +2660,11 @@
- 	CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
- 
- 	r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
-+				  ch == OP_UNDELETE_THREAD ? 0 : 1)
-+		+ mutt_thread_set_flag (extra->hdr, M_PURGED, 0,
- 				  ch == OP_UNDELETE_THREAD ? 0 : 1);
- 
--	if (r != -1)
-+	if (r > -1)
- 	{
- 	  if (option (OPTRESOLVE))
- 	  {
-diff -u mutt-1.5.20-trashfolder/pattern.c mutt-1.5.20-trash+purge/pattern.c
---- mutt-1.5.20-trashfolder/pattern.c	2009-06-03 13:48:31.000000000 -0700
-+++ mutt-1.5.20-trash+purge/pattern.c	2009-09-06 07:25:36.000000000 -0700
-@@ -1347,8 +1347,10 @@
-       {
- 	switch (op)
- 	{
--	  case M_DELETE:
- 	  case M_UNDELETE:
-+	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_PURGED,
-+			   0);
-+	  case M_DELETE:
- 	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_DELETE, 
- 			  (op == M_DELETE));
- 	    break;
-Common subdirectories: mutt-1.5.20-trashfolder/po and mutt-1.5.20-trash+purge/po

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.trash_folder.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.trash_folder.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.cd.trash_folder.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,244 +0,0 @@
-diff -Nru mutt-1.5.20/commands.c mutt-1.5.20-trashfolder/commands.c
---- mutt-1.5.20/commands.c	2009-06-12 16:38:52.000000000 -0700
-+++ mutt-1.5.20-trashfolder/commands.c	2009-08-30 04:27:30.000000000 -0700
-@@ -716,6 +716,7 @@
-     if (option (OPTDELETEUNTAG))
-       mutt_set_flag (Context, h, M_TAG, 0);
-   }
-+  mutt_set_flag (Context, h, M_APPENDED, 1);
-   
-   return 0;
- }
-diff -Nru mutt-1.5.20/flags.c mutt-1.5.20-trashfolder/flags.c
---- mutt-1.5.20/flags.c	2008-12-16 19:50:09.000000000 -0800
-+++ mutt-1.5.20-trashfolder/flags.c	2009-08-30 04:33:19.000000000 -0700
-@@ -65,7 +65,13 @@
-       {
- 	h->deleted = 0;
-         update = 1;
--	if (upd_ctx) ctx->deleted--;
-+	if (upd_ctx)
-+	{
-+	  ctx->deleted--;
-+	  if (h->appended)
-+	    ctx->appended--;
-+	}
-+	h->appended = 0; /* when undeleting, also reset the appended flag */
- #ifdef USE_IMAP
-         /* see my comment above */
- 	if (ctx->magic == M_IMAP) 
-@@ -87,6 +93,17 @@
-       }
-       break;
- 
-+    case M_APPENDED:
-+      if (bf)
-+      {
-+	if (!h->appended)
-+	{
-+	  h->appended = 1;
-+	  if (upd_ctx) ctx->appended++;
-+	}
-+      }
-+      break;
-+
-     case M_NEW:
- 
-       if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-diff -Nru mutt-1.5.20/globals.h mutt-1.5.20-trashfolder/globals.h
---- mutt-1.5.20/globals.h	2009-06-03 13:48:31.000000000 -0700
-+++ mutt-1.5.20-trashfolder/globals.h	2009-08-30 04:33:53.000000000 -0700
-@@ -139,6 +139,7 @@
- WHERE char *Status;
- WHERE char *Tempdir;
- WHERE char *Tochars;
-+WHERE char *TrashPath;
- WHERE char *Username;
- WHERE char *Visual;
- 
-diff -Nru mutt-1.5.20/imap/message.c mutt-1.5.20-trashfolder/imap/message.c
---- mutt-1.5.20/imap/message.c	2009-06-07 10:52:57.000000000 -0700
-+++ mutt-1.5.20-trashfolder/imap/message.c	2009-08-30 04:37:33.000000000 -0700
-@@ -867,6 +867,7 @@
-         if (ctx->hdrs[n]->tagged)
-         {
-           mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
-+	  mutt_set_flag (ctx, ctx->hdrs[n], M_APPENDED, 1);
-           if (option (OPTDELETEUNTAG))
-             mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
-         }
-@@ -874,6 +875,7 @@
-     else
-     {
-       mutt_set_flag (ctx, h, M_DELETE, 1);
-+      mutt_set_flag (ctx, h, M_APPENDED, 1);
-       if (option (OPTDELETEUNTAG))
-         mutt_set_flag (ctx, h, M_TAG, 0);
-     }
-diff -Nru mutt-1.5.20/init.h mutt-1.5.20-trashfolder/init.h
---- mutt-1.5.20/init.h	2009-06-13 14:35:21.000000000 -0700
-+++ mutt-1.5.20-trashfolder/init.h	2009-08-30 04:41:08.000000000 -0700
-@@ -3180,6 +3180,16 @@
-   ** by \fIyou\fP.  The sixth character is used to indicate when a mail
-   ** was sent to a mailing-list you subscribe to.
-   */
-+  { "trash",             DT_PATH, R_NONE, UL &TrashPath, 0 },
-+  /*
-+  ** .pp
-+  ** If set, this variable specifies the path of the trash folder where the
-+  ** mails marked for deletion will be moved, instead of being irremediably
-+  ** purged.
-+  ** .pp
-+  ** NOTE: When you delete a message in the trash folder, it is really
-+  ** deleted, so that you have a way to clean the trash.
-+  */
- #ifdef USE_SOCKET
-   { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },
-   /*
-diff -Nru mutt-1.5.20/mutt.h mutt-1.5.20-trashfolder/mutt.h
---- mutt-1.5.20/mutt.h	2009-06-12 15:15:42.000000000 -0700
-+++ mutt-1.5.20-trashfolder/mutt.h	2009-08-30 04:45:49.000000000 -0700
-@@ -187,6 +187,7 @@
-   M_DELETE,
-   M_UNDELETE,
-   M_DELETED,
-+  M_APPENDED,
-   M_FLAG,
-   M_TAG,
-   M_UNTAG,
-@@ -702,6 +703,7 @@
-   unsigned int flagged : 1; 		/* marked important? */
-   unsigned int tagged : 1;
-   unsigned int deleted : 1;
-+  unsigned int appended : 1;            /* has been saved */
-   unsigned int changed : 1;
-   unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
-   unsigned int old : 1;
-@@ -873,6 +875,7 @@
-   int new;			/* how many new messages? */
-   int unread;			/* how many unread messages? */
-   int deleted;			/* how many deleted messages */
-+  int appended;                 /* how many saved messages? */
-   int flagged;			/* how many flagged messages */
-   int msgnotreadyet;		/* which msg "new" in pager, -1 if none */
- 
-diff -Nru mutt-1.5.20/muttlib.c mutt-1.5.20-trashfolder/muttlib.c
---- mutt-1.5.20/muttlib.c	2009-05-18 17:11:35.000000000 -0700
-+++ mutt-1.5.20-trashfolder/muttlib.c	2009-08-30 04:49:02.000000000 -0700
-@@ -1460,7 +1460,9 @@
- 
-   if (magic > 0 && !mx_access (s, W_OK))
-   {
--    if (option (OPTCONFIRMAPPEND))
-+    if (option (OPTCONFIRMAPPEND) &&
-+      (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))
-+      /* if we're appending to the trash, there's no point in asking */
-     {
-       snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
-       if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
-diff -Nru mutt-1.5.20/mx.c mutt-1.5.20-trashfolder/mx.c
---- mutt-1.5.20/mx.c	2009-06-10 21:29:41.000000000 -0700
-+++ mutt-1.5.20-trashfolder/mx.c	2009-08-30 04:49:51.000000000 -0700
-@@ -773,6 +773,53 @@
-   return rc;
- }
- 
-+/* move deleted mails to the trash folder */
-+static int trash_append (CONTEXT *ctx)
-+{
-+    CONTEXT *ctx_trash;
-+    int i = 0;
-+    struct stat st, stc;
-+
-+    if (!TrashPath || !ctx->deleted ||
-+	(ctx->magic == M_MAILDIR && option (OPTMAILDIRTRASH)))
-+      return 0;
-+
-+    for (;i < ctx->msgcount && (!ctx->hdrs[i]->deleted ||
-+				ctx->hdrs[i]->appended); i++);
-+    if (i == ctx->msgcount)
-+      return 0; /* nothing to be done */
-+
-+    if (mutt_save_confirm (TrashPath, &st) != 0)
-+    {
-+      mutt_error _("message(s) not deleted");
-+      return -1;
-+    }
-+
-+    if (lstat (ctx->path, &stc) == 0 && stc.st_ino == st.st_ino
-+	&& stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev)
-+      return 0;  /* we are in the trash folder: simple sync */
-+
-+    if ((ctx_trash = mx_open_mailbox (TrashPath, M_APPEND, NULL)) != NULL)
-+    {
-+      for (i = 0 ; i < ctx->msgcount ; i++)
-+	if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
-+	    && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
-+	  {
-+	    mx_close_mailbox (ctx_trash, NULL);
-+	    return -1;
-+	  }
-+
-+      mx_close_mailbox (ctx_trash, NULL);
-+    }
-+    else
-+    {
-+      mutt_error _("Can't open trash folder");
-+      return -1;
-+    }
-+
-+    return 0;
-+}
-+
- /* save changes and close mailbox */
- int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
- {
-@@ -909,6 +956,7 @@
- 	  if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
- 	  {
- 	    mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
-+	    mutt_set_flag (ctx, ctx->hdrs[i], M_APPENDED, 1);
- 	  }
- 	  else
- 	  {
-@@ -931,6 +979,14 @@
-     return 0;
-   }
-   
-+  /* copy mails to the trash before expunging */
-+  if (purge && ctx->deleted)
-+    if (trash_append (ctx) != 0)
-+    {
-+      ctx->closing = 0;
-+      return -1;
-+    }
-+
- #ifdef USE_IMAP
-   /* allow IMAP to preserve the deleted flag across sessions */
-   if (ctx->magic == M_IMAP)
-@@ -1130,6 +1186,12 @@
-   msgcount = ctx->msgcount;
-   deleted = ctx->deleted;
- 
-+  if (purge && ctx->deleted)
-+  {
-+    if (trash_append (ctx) == -1)
-+      return -1;
-+  } 
-+
- #ifdef USE_IMAP
-   if (ctx->magic == M_IMAP)
-     rc = imap_sync_mailbox (ctx, purge, index_hint);
-diff -Nru mutt-1.5.20/postpone.c mutt-1.5.20-trashfolder/postpone.c
---- mutt-1.5.20/postpone.c	2009-06-13 14:28:37.000000000 -0700
-+++ mutt-1.5.20-trashfolder/postpone.c	2009-08-30 04:55:51.000000000 -0700
-@@ -276,6 +276,9 @@
-   /* finished with this message, so delete it. */
-   mutt_set_flag (PostContext, h, M_DELETE, 1);
- 
-+  /* and consider it saved, so that it won't be moved to the trash folder */
-+  mutt_set_flag (PostContext, h, M_APPENDED, 1);
-+
-   /* update the count for the status display */
-   PostCount = PostContext->msgcount - PostContext->deleted;
- 

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.crypt.c.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.crypt.c.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.crypt.c.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,41 +0,0 @@
---- mutt-1.5.20/crypt.c	Sat Feb 23 03:12:43 2013 +0000
-+++ mutt-1.5.20/crypt.c	Mon Mar 04 16:43:09 2013 -0800
-@@ -766,6 +766,29 @@
- 
- 
- /*
-+ * This routine addresses inconsistencies in the protocol of
-+ * "multipart/signed" messages and the Content-Type of their 
-+ * parts.
-+ */
-+
-+int mutt_xless_strcasecmp(const char *a, const char *b)
-+{
-+  const char* aPrime;
-+  const char* bPrime;
-+  if (strcasestr(NONULL(a), "x-") == a)
-+    aPrime = a + 2;
-+  else
-+    aPrime = a;
-+  if (strcasestr(NONULL(b), "x-") == b)
-+    bPrime = b + 2;
-+  else
-+    bPrime = b;
-+
-+  return strcasecmp(NONULL(aPrime), NONULL(bPrime));
-+}
-+
-+
-+/*
-  * This routine verifies a  "multipart/signed"  body.
-  */
- 
-@@ -808,7 +831,7 @@
-   /* consistency check */
- 
-   if (!(a && a->next && a->next->type == protocol_major && 
--      !mutt_strcasecmp (a->next->subtype, protocol_minor)))
-+      !mutt_xless_strcasecmp (a->next->subtype, protocol_minor)))
-   {
-     state_attach_puts (_("[-- Error: "
-                          "Inconsistent multipart/signed structure! --]\n\n"),

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.20.gpgme.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,33 +0,0 @@
---- mutt-1.5.20/init.c.orig	2009-07-21 17:54:59 +0200
-+++ mutt-1.5.20/init.c	2009-07-21 17:59:47 +0200
-@@ -37,7 +37,6 @@
- #endif
- 
- 
--
- #include "mx.h"
- #include "init.h"
- #include "mailbox.h"
-@@ -50,6 +49,10 @@
- #include <errno.h>
- #include <sys/wait.h>
- 
-+#if defined(CRYPT_BACKEND_GPGME)
-+#include <gpgme.h>
-+#endif
-+
- #define CHECK_PAGER \
-   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&	\
- 	    (MuttVars[idx].flags & R_RESORT)) \
-@@ -3262,6 +3265,11 @@
- 
-   mutt_read_histfile ();
- 
-+#ifdef CRYPT_BACKEND_GPGME
-+  /* needed since version 1.2.0, ticket #3300 */
-+  gpgme_check_version (NULL);
-+#endif
-+
- #if 0
-   set_option (OPTWEED); /* turn weeding on by default */
- #endif

Deleted: trunk/dports/mail/mutt-devel/files/patch-1.5.23.sidebar.20140412.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-1.5.23.sidebar.20140412.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-1.5.23.sidebar.20140412.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,2374 +0,0 @@
-*** mutt-1.5.23-orig/buffy.c	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/buffy.c	2014-04-12 15:33:54.000000000 -0500
-***************
-*** 161,166 ****
---- 161,209 ----
-    }
-  }
-  
-+ static int buffy_compare_name(const void *a, const void *b) {
-+   const BUFFY *b1 = * (BUFFY * const *) a;
-+   const BUFFY *b2 = * (BUFFY * const *) b;
-+ 
-+   return mutt_strcoll(b1->path, b2->path);
-+ }
-+ 
-+ static BUFFY *buffy_sort(BUFFY *b)
-+ {
-+   BUFFY *tmp = b;
-+   int buffycount = 0;
-+   BUFFY **ary;
-+   int i;
-+ 
-+   if (!option(OPTSIDEBARSORT))
-+     return b;
-+ 
-+   for (; tmp != NULL; tmp = tmp->next)
-+     buffycount++;
-+ 
-+   ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary));
-+ 
-+   tmp = b;
-+   for (i = 0; tmp != NULL; tmp = tmp->next, i++) {
-+     ary[i] = tmp;
-+   }
-+ 
-+   qsort(ary, buffycount, sizeof(*ary), buffy_compare_name);
-+ 
-+   for (i = 0; i < buffycount - 1; i++) {
-+     ary[i]->next = ary[i+1];
-+   }
-+   ary[buffycount - 1]->next = NULL;
-+   for (i = 1; i < buffycount; i++) {
-+     ary[i]->prev = ary[i-1];
-+   }
-+   ary[0]->prev = NULL;
-+ 
-+   tmp = ary[0];
-+   free(ary);
-+   return tmp;
-+ }
-+ 
-  BUFFY *mutt_find_mailbox (const char *path)
-  {
-    BUFFY *tmp = NULL;
-***************
-*** 196,204 ****
---- 239,251 ----
-  static BUFFY *buffy_new (const char *path)
-  {
-    BUFFY* buffy;
-+   char rp[PATH_MAX];
-+   char *r;
-  
-    buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY));
-    strfcpy (buffy->path, path, sizeof (buffy->path));
-+   r = realpath(path, rp);
-+   strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath));
-    buffy->next = NULL;
-    buffy->magic = 0;
-  
-***************
-*** 243,250 ****
-      p = realpath (buf, f1);
-      for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
-      {
-!       q = realpath ((*tmp)->path, f2);
-!       if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)
-        {
-  	dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
-  	break;
---- 290,297 ----
-      p = realpath (buf, f1);
-      for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
-      {
-!       q = (*tmp)->realpath;
-!       if (mutt_strcmp (p ? p : buf, q) == 0)
-        {
-  	dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
-  	break;
-***************
-*** 282,287 ****
---- 329,335 ----
-      else
-        (*tmp)->size = 0;
-    }
-+   Incoming = buffy_sort(Incoming);
-    return 0;
-  }
-  
-***************
-*** 306,311 ****
---- 354,364 ----
-        return 0;
-    }
-  
-+   if (option(OPTSIDEBAR) && mailbox->msg_unread > 0) {
-+       mailbox->new = 1;
-+       return 1;
-+   }
-+ 
-    if ((dirp = opendir (path)) == NULL)
-    {
-      mailbox->magic = 0;
-***************
-*** 340,345 ****
---- 393,464 ----
-    return rc;
-  }
-  
-+ /* update message counts for the sidebar */
-+ void buffy_maildir_update (BUFFY* mailbox)
-+ {
-+   char path[_POSIX_PATH_MAX];
-+   DIR *dirp;
-+   struct dirent *de;
-+   char *p;
-+ 
-+   if(!option(OPTSIDEBAR))
-+       return;
-+ 
-+   mailbox->msgcount = 0;
-+   mailbox->msg_unread = 0;
-+   mailbox->msg_flagged = 0;
-+ 
-+   snprintf (path, sizeof (path), "%s/new", mailbox->path);
-+         
-+   if ((dirp = opendir (path)) == NULL)
-+   {   
-+     mailbox->magic = 0;
-+     return;
-+   } 
-+       
-+   while ((de = readdir (dirp)) != NULL)
-+   {
-+     if (*de->d_name == '.')
-+       continue;
-+ 
-+     if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
-+       mailbox->new = 1;
-+       mailbox->msgcount++;
-+       mailbox->msg_unread++;
-+     }
-+   }
-+ 
-+   closedir (dirp);
-+   snprintf (path, sizeof (path), "%s/cur", mailbox->path);
-+         
-+   if ((dirp = opendir (path)) == NULL)
-+   {   
-+     mailbox->magic = 0;
-+     return;
-+   } 
-+       
-+   while ((de = readdir (dirp)) != NULL)
-+   {
-+     if (*de->d_name == '.')
-+       continue;
-+ 
-+     if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
-+       mailbox->msgcount++;
-+       if ((p = strstr (de->d_name, ":2,"))) {
-+         if (!strchr (p + 3, 'T')) {
-+           if (!strchr (p + 3, 'S'))
-+             mailbox->msg_unread++;
-+           if (strchr(p + 3, 'F'))
-+             mailbox->msg_flagged++;
-+         }
-+       }
-+     }
-+   }
-+ 
-+   mailbox->sb_last_checked = time(NULL);
-+   closedir (dirp);
-+ }
-+ 
-  /* returns 1 if mailbox has new mail */ 
-  static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
-  {
-***************
-*** 351,357 ****
-    else
-      statcheck = sb->st_mtime > sb->st_atime
-        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
-!   if (statcheck)
-    {
-      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
-      {
---- 470,476 ----
-    else
-      statcheck = sb->st_mtime > sb->st_atime
-        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
-!   if ((!option(OPTSIDEBAR) && statcheck) || (option(OPTSIDEBAR) && mailbox->msg_unread > 0))
-    {
-      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
-      {
-***************
-*** 371,376 ****
---- 490,516 ----
-    return rc;
-  }
-  
-+ /* update message counts for the sidebar */
-+ void buffy_mbox_update (BUFFY* mailbox, struct stat *sb)
-+ {
-+   CONTEXT *ctx = NULL;
-+ 
-+   if(!option(OPTSIDEBAR))
-+       return;
-+   if(mailbox->sb_last_checked > sb->st_mtime && mailbox->msgcount != 0)
-+       return; /* no check necessary */
-+ 
-+   ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
-+   if(ctx)
-+   {
-+     mailbox->msgcount = ctx->msgcount;
-+     mailbox->msg_unread = ctx->unread;
-+     mailbox->msg_flagged = ctx->flagged;
-+     mailbox->sb_last_checked = time(NULL);
-+     mx_close_mailbox(ctx, 0);
-+   }
-+ }
-+ 
-  int mutt_buffy_check (int force)
-  {
-    BUFFY *tmp;
-***************
-*** 444,460 ****
-        {
-        case M_MBOX:
-        case M_MMDF:
-  	if (buffy_mbox_hasnew (tmp, &sb) > 0)
-  	  BuffyCount++;
-  	break;
-  
-        case M_MAILDIR:
-  	if (buffy_maildir_hasnew (tmp) > 0)
-  	  BuffyCount++;
-  	break;
-  
-        case M_MH:
-! 	mh_buffy(tmp);
-  	if (tmp->new)
-  	  BuffyCount++;
-  	break;
---- 584,603 ----
-        {
-        case M_MBOX:
-        case M_MMDF:
-+ 	buffy_mbox_update (tmp, &sb);
-  	if (buffy_mbox_hasnew (tmp, &sb) > 0)
-  	  BuffyCount++;
-  	break;
-  
-        case M_MAILDIR:
-+ 	buffy_maildir_update (tmp);
-  	if (buffy_maildir_hasnew (tmp) > 0)
-  	  BuffyCount++;
-  	break;
-  
-        case M_MH:
-! 	mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked);
-!         mh_buffy(tmp);
-  	if (tmp->new)
-  	  BuffyCount++;
-  	break;
-*** mutt-1.5.23-orig/buffy.h	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/buffy.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 23,35 ****
---- 23,41 ----
-  typedef struct buffy_t
-  {
-    char path[_POSIX_PATH_MAX];
-+   char realpath[_POSIX_PATH_MAX];
-    off_t size;
-    struct buffy_t *next;
-+   struct buffy_t *prev;
-    short new;			/* mailbox has new mail */
-+   int msgcount;			/* total number of messages */
-+   int msg_unread;		/* number of unread messages */
-+   int msg_flagged;		/* number of flagged messages */
-    short notified;		/* user has been notified */
-    short magic;			/* mailbox type */
-    short newly_created;		/* mbox or mmdf just popped into existence */
-    time_t last_visited;		/* time of last exit from this mailbox */
-+   time_t sb_last_checked;      /* time of last buffy check from sidebar */
-  }
-  BUFFY;
-  
-*** mutt-1.5.23-orig/color.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/color.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 93,98 ****
---- 93,100 ----
-    { "bold",		MT_COLOR_BOLD },
-    { "underline",	MT_COLOR_UNDERLINE },
-    { "index",		MT_COLOR_INDEX },
-+   { "sidebar_new",	MT_COLOR_NEW },
-+   { "sidebar_flagged",	MT_COLOR_FLAGGED },
-    { NULL,		0 }
-  };
-  
-*** mutt-1.5.23-orig/compose.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/compose.c	2014-04-12 12:15:56.000000000 -0500
-***************
-*** 72,78 ****
-  
-  #define HDR_XOFFSET 10
-  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
-! #define W (COLS - HDR_XOFFSET)
-  
-  static const char * const Prompts[] =
-  {
---- 72,78 ----
-  
-  #define HDR_XOFFSET 10
-  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
-! #define W (COLS - HDR_XOFFSET - SidebarWidth)
-  
-  static const char * const Prompts[] =
-  {
-***************
-*** 110,116 ****
-  
-  static void redraw_crypt_lines (HEADER *msg)
-  {
-!   mvaddstr (HDR_CRYPT, 0, "Security: ");
-  
-    if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
-    {
---- 110,116 ----
-  
-  static void redraw_crypt_lines (HEADER *msg)
-  {
-!   mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
-  
-    if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
-    {
-***************
-*** 142,148 ****
-    }
-  
-    clrtoeol ();
-!   move (HDR_CRYPTINFO, 0);
-    clrtoeol ();
-  
-    if ((WithCrypto & APPLICATION_PGP)
---- 142,148 ----
-    }
-  
-    clrtoeol ();
-!   move (HDR_CRYPTINFO, SidebarWidth);
-    clrtoeol ();
-  
-    if ((WithCrypto & APPLICATION_PGP)
-***************
-*** 159,165 ****
-        && (msg->security & ENCRYPT)
-        && SmimeCryptAlg
-        && *SmimeCryptAlg) {
-!       mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
-  		NONULL(SmimeCryptAlg));
-    }
-  }
---- 159,165 ----
-        && (msg->security & ENCRYPT)
-        && SmimeCryptAlg
-        && *SmimeCryptAlg) {
-!       mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
-  		NONULL(SmimeCryptAlg));
-    }
-  }
-***************
-*** 172,178 ****
-    int c;
-    char *t;
-  
-!   mvaddstr (HDR_MIX, 0,     "     Mix: ");
-  
-    if (!chain)
-    {
---- 172,178 ----
-    int c;
-    char *t;
-  
-!   mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
-  
-    if (!chain)
-    {
-***************
-*** 187,193 ****
-      if (t && t[0] == '0' && t[1] == '\0')
-        t = "<random>";
-      
-!     if (c + mutt_strlen (t) + 2 >= COLS)
-        break;
-  
-      addstr (NONULL(t));
---- 187,193 ----
-      if (t && t[0] == '0' && t[1] == '\0')
-        t = "<random>";
-      
-!     if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
-        break;
-  
-      addstr (NONULL(t));
-***************
-*** 239,245 ****
-  
-    buf[0] = 0;
-    rfc822_write_address (buf, sizeof (buf), addr, 1);
-!   mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
-    mutt_paddstr (W, buf);
-  }
-  
---- 239,245 ----
-  
-    buf[0] = 0;
-    rfc822_write_address (buf, sizeof (buf), addr, 1);
-!   mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
-    mutt_paddstr (W, buf);
-  }
-  
-***************
-*** 249,258 ****
-    draw_envelope_addr (HDR_TO, msg->env->to);
-    draw_envelope_addr (HDR_CC, msg->env->cc);
-    draw_envelope_addr (HDR_BCC, msg->env->bcc);
-!   mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
-    mutt_paddstr (W, NONULL (msg->env->subject));
-    draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
-!   mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
-    mutt_paddstr (W, fcc);
-  
-    if (WithCrypto)
---- 249,258 ----
-    draw_envelope_addr (HDR_TO, msg->env->to);
-    draw_envelope_addr (HDR_CC, msg->env->cc);
-    draw_envelope_addr (HDR_BCC, msg->env->bcc);
-!   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);
-!   mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
-    mutt_paddstr (W, fcc);
-  
-    if (WithCrypto)
-***************
-*** 263,269 ****
-  #endif
-  
-    SETCOLOR (MT_COLOR_STATUS);
-!   mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
-    clrtoeol ();
-  
-    NORMAL_COLOR;
---- 263,269 ----
-  #endif
-  
-    SETCOLOR (MT_COLOR_STATUS);
-!   mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
-    clrtoeol ();
-  
-    NORMAL_COLOR;
-***************
-*** 299,305 ****
-    /* redraw the expanded list so the user can see the result */
-    buf[0] = 0;
-    rfc822_write_address (buf, sizeof (buf), *addr, 1);
-!   move (line, HDR_XOFFSET);
-    mutt_paddstr (W, buf);
-    
-    return 0;
---- 299,305 ----
-    /* redraw the expanded list so the user can see the result */
-    buf[0] = 0;
-    rfc822_write_address (buf, sizeof (buf), *addr, 1);
-!   move (line, HDR_XOFFSET+SidebarWidth);
-    mutt_paddstr (W, buf);
-    
-    return 0;
-***************
-*** 544,550 ****
-  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
-  	{
-  	  mutt_str_replace (&msg->env->subject, buf);
-! 	  move (HDR_SUBJECT, HDR_XOFFSET);
-  	  if (msg->env->subject)
-  	    mutt_paddstr (W, msg->env->subject);
-  	  else
---- 544,550 ----
-  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
-  	{
-  	  mutt_str_replace (&msg->env->subject, buf);
-! 	  move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
-  	  if (msg->env->subject)
-  	    mutt_paddstr (W, msg->env->subject);
-  	  else
-***************
-*** 562,568 ****
-  	{
-  	  strfcpy (fcc, buf, fcclen);
-  	  mutt_pretty_mailbox (fcc, fcclen);
-! 	  move (HDR_FCC, HDR_XOFFSET);
-  	  mutt_paddstr (W, fcc);
-  	  fccSet = 1;
-  	}
---- 562,568 ----
-  	{
-  	  strfcpy (fcc, buf, fcclen);
-  	  mutt_pretty_mailbox (fcc, fcclen);
-! 	  move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
-  	  mutt_paddstr (W, fcc);
-  	  fccSet = 1;
-  	}
-*** mutt-1.5.23-orig/configure.ac	2014-03-12 11:26:40.000000000 -0500
---- mutt-1.5.23/configure.ac	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1276,1281 ****
---- 1276,1283 ----
-    AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
-  fi
-  
-+ AC_CHECK_FUNCS(fmemopen open_memstream)
-+ 
-  dnl Documentation tools
-  have_openjade="no"
-  AC_PATH_PROG([OSPCAT], [ospcat], [none])
-*** mutt-1.5.23-orig/curs_main.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/curs_main.c	2014-04-12 21:45:21.000000000 -0500
-***************
-*** 26,32 ****
---- 26,34 ----
-  #include "mailbox.h"
-  #include "mapping.h"
-  #include "sort.h"
-+ #include "buffy.h"
-  #include "mx.h"
-+ #include "sidebar.h"
-  
-  #ifdef USE_POP
-  #include "pop.h"
-***************
-*** 519,538 ****
-         menu->redraw |= REDRAW_STATUS;
-       if (do_buffy_notify)
-       {
-!        if (mutt_buffy_notify () && option (OPTBEEPNEW))
-!  	beep ();
-       }
-       else
-         do_buffy_notify = 1;
-      }
-  
-      if (op != -1)
-        mutt_curs_set (0);
-  
-      if (menu->redraw & REDRAW_FULL)
-      {
-        menu_redraw_full (menu);
-        mutt_show_error ();
-      }
-  
-      if (menu->menu == MENU_MAIN)
---- 521,551 ----
-         menu->redraw |= REDRAW_STATUS;
-       if (do_buffy_notify)
-       {
-!        if (mutt_buffy_notify ())
-!        {
-!          menu->redraw |= REDRAW_STATUS;
-!          if (option (OPTBEEPNEW))
-!            beep ();
-!        }
-       }
-       else
-         do_buffy_notify = 1;
-      }
-  
-+     if(option(OPTSIDEBAR))
-+         menu->redraw |= REDRAW_SIDEBAR;
-+ 
-      if (op != -1)
-        mutt_curs_set (0);
-  
-      if (menu->redraw & REDRAW_FULL)
-      {
-        menu_redraw_full (menu);
-+       draw_sidebar(menu->menu);
-        mutt_show_error ();
-+     } else if(menu->redraw & REDRAW_SIDEBAR) {
-+         draw_sidebar(menu->menu);
-+         menu->redraw &= ~REDRAW_SIDEBAR;
-      }
-  
-      if (menu->menu == MENU_MAIN)
-***************
-*** 554,562 ****
---- 567,578 ----
-  
-        if (menu->redraw & REDRAW_STATUS)
-        {
-+         DrawFullLine = 1;
-  	menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
-+         DrawFullLine = 0;
-  	move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);
-  	SETCOLOR (MT_COLOR_STATUS);
-+         set_buffystats(Context);
-  	mutt_paddstr (COLS, buf);
-  	NORMAL_COLOR;
-  	menu->redraw &= ~REDRAW_STATUS;
-***************
-*** 569,575 ****
-  	menu->oldcurrent = -1;
-  
-        if (option (OPTARROWCURSOR))
-! 	move (menu->current - menu->top + menu->offset, 2);
-        else if (option (OPTBRAILLEFRIENDLY))
-  	move (menu->current - menu->top + menu->offset, 0);
-        else
---- 585,591 ----
-  	menu->oldcurrent = -1;
-  
-        if (option (OPTARROWCURSOR))
-! 	move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
-        else if (option (OPTBRAILLEFRIENDLY))
-  	move (menu->current - menu->top + menu->offset, 0);
-        else
-***************
-*** 1011,1016 ****
---- 1027,1033 ----
-  	  break;
-  
-  	CHECK_MSGCOUNT;
-+         CHECK_VISIBLE;
-  	CHECK_READONLY;
-  	{
-  	  int oldvcount = Context->vcount;
-***************
-*** 1070,1075 ****
---- 1087,1093 ----
-  	  menu->redraw = REDRAW_FULL;
-  	break;
-  
-+       case OP_SIDEBAR_OPEN:
-        case OP_MAIN_CHANGE_FOLDER:
-        case OP_MAIN_NEXT_UNREAD_MAILBOX:
-  
-***************
-*** 1101,1107 ****
-  	{
-  	  mutt_buffy (buf, sizeof (buf));
-  
-! 	  if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
-  	  {
-  	    if (menu->menu == MENU_PAGER)
-  	    {
---- 1119,1129 ----
-  	{
-  	  mutt_buffy (buf, sizeof (buf));
-  
-!           if ( op == OP_SIDEBAR_OPEN ) {
-!               if(!CurBuffy)
-!                 break;
-!             strncpy( buf, CurBuffy->path, sizeof(buf) );  
-! 	    } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
-  	  {
-  	    if (menu->menu == MENU_PAGER)
-  	    {
-***************
-*** 1119,1124 ****
---- 1141,1147 ----
-  	}
-  
-  	mutt_expand_path (buf, sizeof (buf));
-+         set_curbuffy(buf);
-  	if (mx_get_magic (buf) <= 0)
-  	{
-  	  mutt_error (_("%s is not a mailbox."), buf);
-***************
-*** 2209,2214 ****
---- 2232,2243 ----
-  	mutt_what_key();
-  	break;
-  
-+       case OP_SIDEBAR_SCROLL_UP:
-+       case OP_SIDEBAR_SCROLL_DOWN:
-+       case OP_SIDEBAR_NEXT:
-+       case OP_SIDEBAR_PREV:
-+         scroll_sidebar(op, menu->menu);
-+         break;
-        default:
-  	if (menu->menu == MENU_MAIN)
-  	  km_error_key (MENU_MAIN);
-*** mutt-1.5.23-orig/flags.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/flags.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 22,29 ****
---- 22,31 ----
-  
-  #include "mutt.h"
-  #include "mutt_curses.h"
-+ #include "mutt_menu.h"
-  #include "sort.h"
-  #include "mx.h"
-+ #include "sidebar.h"
-  
-  void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
-  {
-***************
-*** 263,268 ****
---- 265,271 ----
-     */
-    if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
-      h->searched = 0;
-+ 	draw_sidebar(0);
-  }
-  
-  void mutt_tag_set_flag (int flag, int bf)
-*** mutt-1.5.23-orig/functions.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/functions.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 169,174 ****
---- 169,179 ----
-    { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
-  
-  
-+  { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
-+  { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
-+  { "sidebar-next",		OP_SIDEBAR_NEXT, NULL },
-+  { "sidebar-prev",		OP_SIDEBAR_PREV, NULL },
-+  { "sidebar-open",		OP_SIDEBAR_OPEN, NULL },
-    { NULL,			0,				NULL }
-  };
-  
-***************
-*** 272,277 ****
---- 277,287 ----
-  
-    { "what-key",		OP_WHAT_KEY,		NULL },
-  
-+   { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
-+   { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
-+   { "sidebar-next",	OP_SIDEBAR_NEXT, NULL },
-+   { "sidebar-prev",	OP_SIDEBAR_PREV, NULL },
-+   { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
-    { NULL,		0,				NULL }
-  };
-  
-*** mutt-1.5.23-orig/globals.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/globals.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 117,122 ****
---- 117,125 ----
-  WHERE char *SendCharset;
-  WHERE char *Sendmail;
-  WHERE char *Shell;
-+ WHERE char *SidebarDelim;
-+ WHERE char *SidebarFormat;
-+ WHERE char *SidebarIndentStr;
-  WHERE char *Signature;
-  WHERE char *SimpleSearch;
-  #if USE_SMTP
-***************
-*** 208,213 ****
---- 211,219 ----
-  WHERE short ScoreThresholdRead;
-  WHERE short ScoreThresholdFlag;
-  
-+ WHERE struct buffy_t *CurBuffy INITVAL(0);
-+ WHERE short DrawFullLine INITVAL(0);
-+ WHERE short SidebarWidth;
-  #ifdef USE_IMAP
-  WHERE short ImapKeepalive;
-  WHERE short ImapPipelineDepth;
-*** mutt-1.5.23-orig/handler.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/handler.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1599,1604 ****
---- 1599,1609 ----
-    size_t tmplength = 0;
-    int rc = 0;
-  
-+ #ifdef HAVE_FMEMOPEN
-+   char *temp;
-+   size_t tempsize;
-+ #endif
-+ 
-    int oflags = s->flags;
-    
-    /* first determine which handler to use to process this part */
-***************
-*** 1711,1716 ****
---- 1716,1729 ----
-        {
-  	/* decode to a tempfile, saving the original destination */
-  	fp = s->fpout;
-+ #ifdef HAVE_FMEMOPEN
-+ 	if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
-+ 	{
-+ 	  mutt_error _("Unable to open memory stream!");
-+ 	  dprint (1, (debugfile, "Can't open memory stream.\n"));
-+ 	  goto bail;
-+ 	}
-+ #else
-  	mutt_mktemp (tempfile, sizeof (tempfile));
-  	if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
-  	{
-***************
-*** 1718,1723 ****
---- 1731,1737 ----
-  	  dprint (1, (debugfile, "Can't open %s.\n", tempfile));
-  	  goto bail;
-  	}
-+ #endif
-  	/* decoding the attachment changes the size and offset, so save a copy
-  	 * of the "real" values now, and restore them after processing
-  	 */
-***************
-*** 1746,1753 ****
---- 1760,1778 ----
-  	/* restore final destination and substitute the tempfile for input */
-  	s->fpout = fp;
-  	fp = s->fpin;
-+ #ifdef HAVE_FMEMOPEN
-+ 	if(tempsize)
-+ 		s->fpin = fmemopen(temp, tempsize, "r");
-+ 	else /* fmemopen cannot handle zero-length buffers */
-+ 		s->fpin = safe_fopen ("/dev/null", "r");
-+ 	if(s->fpin == NULL) {
-+ 		mutt_perror("failed to re-open memstream!");
-+ 		return (-1);
-+ 	}
-+ #else
-  	s->fpin = fopen (tempfile, "r");
-  	unlink (tempfile);
-+ #endif
-  
-  	/* restore the prefix */
-  	s->prefix = savePrefix;
-***************
-*** 1773,1778 ****
---- 1798,1807 ----
-  
-  	/* restore the original source stream */
-  	safe_fclose (&s->fpin);
-+ #ifdef HAVE_FMEMOPEN
-+ 	if(tempsize)
-+ 	    FREE(&temp);
-+ #endif
-  	s->fpin = fp;
-        }
-      }
-*** mutt-1.5.23-orig/init.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/init.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1966,1971 ****
---- 1966,2019 ----
-    ** not used.
-    ** (PGP only)
-    */
-+   {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"},
-+   /*
-+   ** .pp
-+   ** This specifies the delimiter between the sidebar (if visible) and 
-+   ** other screens.
-+   */
-+   {"sidebar_indentstr", DT_STR, R_BOTH, UL &SidebarIndentStr, UL " "},
-+   /*
-+   ** .pp
-+   ** This specifies the string that is used to indent items
-+   ** with sidebar_folderindent= yes
-+   */
-+   { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
-+   /*
-+   ** .pp
-+   ** This specifies whether or not to show sidebar (left-side list of folders).
-+   */
-+   { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
-+   /*
-+   ** .pp
-+   ** This specifies whether or not to sort the sidebar alphabetically.
-+   */
-+   { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
-+   /*
-+   ** .pp
-+   ** The width of the sidebar.
-+   */
-+   { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 },
-+   /*
-+   ** .pp
-+   ** Should the sidebar shorten the path showed.
-+   */
-+   {"sidebar_format", DT_STR, R_NONE, UL &SidebarFormat, UL "%B%?F? [%F]?%* %?N?%N/?%4S"},
-+   /*
-+   ** .pp
-+   ** Format string for the sidebar. The sequences `%N', `%F' and `%S'
-+   ** will be replaced by the number of new or flagged messages or the total
-+   ** size of them mailbox. `%B' will be replaced with the name of the mailbox.
-+   ** The `%!' sequence will be expanded to `!' if there is one flagged message;
-+   ** to `!!' if there are two flagged messages; and to `n!' for n flagged
-+   ** messages, n>2.
-+   */
-+   { "sidebar_folderindent", DT_BOOL, R_BOTH, OPTSIDEBARFOLDERINDENT, 0 },
-+   /*
-+   ** .pp
-+   ** Should folders be indented in the sidebar.
-+   */
-+ 
-    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
-    /*
-    ** .pp
-*** mutt-1.5.23-orig/mailbox.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mailbox.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 27,32 ****
---- 27,33 ----
-  #define M_NEWFOLDER	(1<<4) /* create a new folder - same as M_APPEND, but uses
-  				* safe_fopen() for mbox-style folders.
-  				*/
-+ #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 */
-*** mutt-1.5.23-orig/main.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/main.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 50,55 ****
---- 50,56 ----
-  #include <unistd.h>
-  #include <errno.h>
-  #include <sys/stat.h>
-+ #include <limits.h>
-  #include <sys/utsname.h>
-  
-  #ifdef HAVE_GETOPT_H
-***************
-*** 555,561 ****
-  
-  int main (int argc, char **argv)
-  {
-!   char folder[_POSIX_PATH_MAX] = "";
-    char *subject = NULL;
-    char *includeFile = NULL;
-    char *draftFile = NULL;
---- 556,562 ----
-  
-  int main (int argc, char **argv)
-  {
-!   char folder[PATH_MAX] = "";
-    char *subject = NULL;
-    char *includeFile = NULL;
-    char *draftFile = NULL;
-***************
-*** 1025,1030 ****
---- 1026,1038 ----
-        strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
-      mutt_expand_path (folder, sizeof (folder));
-  
-+     {
-+       char tmpfolder[PATH_MAX];
-+       strfcpy (tmpfolder, folder, sizeof (tmpfolder));
-+       if(!realpath(tmpfolder, folder))
-+           strfcpy (folder, tmpfolder, sizeof (tmpfolder));
-+     }
-+ 
-      mutt_str_replace (&CurrentFolder, folder);
-      mutt_str_replace (&LastFolder, folder);
-  
-***************
-*** 1047,1052 ****
---- 1055,1061 ----
-      if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
-         || !explicit_folder)
-      {
-+       set_curbuffy(folder);
-        mutt_index_menu ();
-        if (Context)
-  	FREE (&Context);
-*** mutt-1.5.23-orig/Makefile.am	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/Makefile.am	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 32,37 ****
---- 32,38 ----
-  	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 \
-+ 	sidebar.c \
-  	muttlib.c editmsg.c mbyte.c \
-  	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-  
-*** mutt-1.5.23-orig/Makefile.in	2014-03-12 11:26:44.000000000 -0500
---- mutt-1.5.23/Makefile.in	2014-04-12 12:12:38.000000000 -0500
-***************
-*** 129,135 ****
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-  	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-! 	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
---- 129,136 ----
-  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-  	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-! 	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) \
-! 	sidebar.$(OBJEXT)
-  am__objects_1 =
-  am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
-  	$(am__objects_1)
-***************
-*** 468,474 ****
-  	score.c send.c sendlib.c signal.c sort.c \
-  	status.c system.c thread.c charset.c history.c lib.c \
-  	muttlib.c editmsg.c mbyte.c \
-! 	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
-  
-  nodist_mutt_SOURCES = $(BUILT_SOURCES)
-  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
---- 469,476 ----
-  	score.c send.c sendlib.c signal.c sort.c \
-  	status.c system.c thread.c charset.c history.c lib.c \
-  	muttlib.c editmsg.c mbyte.c \
-! 	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \
-! 	sidebar.c
-  
-  nodist_mutt_SOURCES = $(BUILT_SOURCES)
-  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
-***************
-*** 500,506 ****
-  	README.SSL smime.h group.h \
-  	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
-  	ChangeLog mkchangelog.sh mutt_idna.h \
-! 	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \
-  	txt2c.c txt2c.sh version.sh check_sec.sh
-  
-  EXTRA_SCRIPTS = smime_keys
---- 502,508 ----
-  	README.SSL smime.h group.h \
-  	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
-  	ChangeLog mkchangelog.sh mutt_idna.h \
-! 	snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in \
-  	txt2c.c txt2c.sh version.sh check_sec.sh
-  
-  EXTRA_SCRIPTS = smime_keys
-*** mutt-1.5.23-orig/mbox.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mbox.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 100,105 ****
---- 100,106 ----
-      mutt_perror (ctx->path);
-      return (-1);
-    }
-+   ctx->atime = sb.st_atime;
-    ctx->mtime = sb.st_mtime;
-    ctx->size = sb.st_size;
-  
-***************
-*** 251,256 ****
---- 252,258 ----
-  
-    ctx->size = sb.st_size;
-    ctx->mtime = sb.st_mtime;
-+   ctx->atime = sb.st_atime;
-  
-  #ifdef NFS_ATTRIBUTE_HACK
-    if (sb.st_mtime > sb.st_atime)
-*** mutt-1.5.23-orig/menu.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/menu.c	2014-04-12 21:31:16.000000000 -0500
-***************
-*** 24,29 ****
---- 24,30 ----
-  #include "mutt_curses.h"
-  #include "mutt_menu.h"
-  #include "mbyte.h"
-+ #include "sidebar.h"
-  
-  extern size_t UngetCount;
-  
-***************
-*** 186,192 ****
-  {
-    char *scratch = safe_strdup (s);
-    int shift = option (OPTARROWCURSOR) ? 3 : 0;
-!   int cols = COLS - shift;
-  
-    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
-    s[n - 1] = 0;
---- 187,193 ----
-  {
-    char *scratch = safe_strdup (s);
-    int shift = option (OPTARROWCURSOR) ? 3 : 0;
-!   int cols = COLS - shift - SidebarWidth;
-  
-    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
-    s[n - 1] = 0;
-***************
-*** 239,244 ****
---- 240,246 ----
-    int do_color;
-    int attr;
-  
-+   draw_sidebar(1);
-    for (i = menu->top; i < menu->top + menu->pagelen; i++)
-    {
-      if (i < menu->max)
-***************
-*** 249,255 ****
-        menu_pad_string (buf, sizeof (buf));
-  
-        ATTRSET(attr);
-!       move(i - menu->top + menu->offset, 0);
-        do_color = 1;
-  
-        if (i == menu->current)
---- 251,257 ----
-        menu_pad_string (buf, sizeof (buf));
-  
-        ATTRSET(attr);
-!       move(i - menu->top + menu->offset, SidebarWidth);
-        do_color = 1;
-  
-        if (i == menu->current)
-***************
-*** 272,278 ****
-      else
-      {
-        NORMAL_COLOR;
-!       CLEARLINE(i - menu->top + menu->offset);
-      }
-    }
-    NORMAL_COLOR;
---- 274,280 ----
-      else
-      {
-        NORMAL_COLOR;
-!       CLEARLINE_WIN (i - menu->top + menu->offset);
-      }
-    }
-    NORMAL_COLOR;
-***************
-*** 289,295 ****
-      return;
-    }
-    
-!   move (menu->oldcurrent + menu->offset - menu->top, 0);
-    ATTRSET(menu->color (menu->oldcurrent));
-  
-    if (option (OPTARROWCURSOR))
---- 291,297 ----
-      return;
-    }
-    
-!   move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
-    ATTRSET(menu->color (menu->oldcurrent));
-  
-    if (option (OPTARROWCURSOR))
-***************
-*** 301,313 ****
-      {
-        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
-        menu_pad_string (buf, sizeof (buf));
-!       move (menu->oldcurrent + menu->offset - menu->top, 3);
-        print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
-      }
-  
-      /* now draw it in the new location */
-      SETCOLOR(MT_COLOR_INDICATOR);
-!     mvaddstr(menu->current + menu->offset - menu->top, 0, "->");
-    }
-    else
-    {
---- 303,315 ----
-      {
-        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
-        menu_pad_string (buf, sizeof (buf));
-!       move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
-        print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
-      }
-  
-      /* now draw it in the new location */
-      SETCOLOR(MT_COLOR_INDICATOR);
-!     mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");
-    }
-    else
-    {
-***************
-*** 320,326 ****
-      menu_make_entry (buf, sizeof (buf), menu, menu->current);
-      menu_pad_string (buf, sizeof (buf));
-      SETCOLOR(MT_COLOR_INDICATOR);
-!     move(menu->current - menu->top + menu->offset, 0);
-      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
-    }
-    menu->redraw &= REDRAW_STATUS;
---- 322,328 ----
-      menu_make_entry (buf, sizeof (buf), menu, menu->current);
-      menu_pad_string (buf, sizeof (buf));
-      SETCOLOR(MT_COLOR_INDICATOR);
-!     move(menu->current - menu->top + menu->offset, SidebarWidth);
-      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
-    }
-    menu->redraw &= REDRAW_STATUS;
-***************
-*** 332,338 ****
-    char buf[LONG_STRING];
-    int attr = menu->color (menu->current);
-    
-!   move (menu->current + menu->offset - menu->top, 0);
-    menu_make_entry (buf, sizeof (buf), menu, menu->current);
-    menu_pad_string (buf, sizeof (buf));
-  
---- 334,340 ----
-    char buf[LONG_STRING];
-    int attr = menu->color (menu->current);
-    
-!   move (menu->current + menu->offset - menu->top, SidebarWidth);
-    menu_make_entry (buf, sizeof (buf), menu, menu->current);
-    menu_pad_string (buf, sizeof (buf));
-  
-***************
-*** 872,878 ****
-      
-      
-      if (option (OPTARROWCURSOR))
-!       move (menu->current - menu->top + menu->offset, 2);
-      else if (option (OPTBRAILLEFRIENDLY))
-        move (menu->current - menu->top + menu->offset, 0);
-      else
---- 874,880 ----
-      
-      
-      if (option (OPTARROWCURSOR))
-!       move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
-      else if (option (OPTBRAILLEFRIENDLY))
-        move (menu->current - menu->top + menu->offset, 0);
-      else
-*** mutt-1.5.23-orig/mh.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mh.c	2014-04-11 11:04:59.000000000 -0500
-***************
-*** 295,300 ****
---- 295,326 ----
-    mhs_free_sequences (&mhs);
-  }
-  
-+ void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged, time_t *sb_last_checked)
-+ {
-+   int i;
-+   struct mh_sequences mhs;
-+   memset (&mhs, 0, sizeof (mhs));
-+ 
-+   if(!option(OPTSIDEBAR))
-+       return;
-+ 
-+   if (mh_read_sequences (&mhs, path) < 0)
-+     return;
-+ 
-+   msgcount = 0;
-+   msg_unread = 0;
-+   msg_flagged = 0;
-+   for (i = 0; i <= mhs.max; i++)
-+     msgcount++;
-+     if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
-+       msg_unread++;
-+     }
-+     if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)
-+       msg_flagged++;
-+   mhs_free_sequences (&mhs);
-+   *sb_last_checked = time(NULL);
-+ }
-+ 
-  static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
-  {
-    int fd;
-*** mutt-1.5.23-orig/mutt_curses.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mutt_curses.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 64,69 ****
---- 64,70 ----
-  #undef lines
-  #endif /* lines */
-  
-+ #define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
-  #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,125 ****
---- 121,128 ----
-    MT_COLOR_BOLD,
-    MT_COLOR_UNDERLINE,
-    MT_COLOR_INDEX,
-+   MT_COLOR_NEW,
-+   MT_COLOR_FLAGGED,
-    MT_COLOR_MAX
-  };
-  
-*** mutt-1.5.23-orig/mutt_menu.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/mutt_menu.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 34,39 ****
---- 34,40 ----
-  #define REDRAW_FULL		(1<<5)
-  #define REDRAW_BODY		(1<<6)
-  #define REDRAW_SIGWINCH		(1<<7)
-+ #define REDRAW_SIDEBAR		(1<<8)
-  
-  #define M_MODEFMT "-- Mutt: %s"
-  
-*** mutt-1.5.23-orig/mutt.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/mutt.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 421,426 ****
---- 421,430 ----
-    OPTSAVEEMPTY,
-    OPTSAVENAME,
-    OPTSCORE,
-+   OPTSIDEBAR,
-+   OPTSIDEBARSHORTPATH,
-+   OPTSIDEBARSORT,
-+   OPTSIDEBARFOLDERINDENT,
-    OPTSIGDASHES,
-    OPTSIGONTOP,
-    OPTSORTRE,
-***************
-*** 861,866 ****
---- 865,871 ----
-  {
-    char *path;
-    FILE *fp;
-+   time_t atime;
-    time_t mtime;
-    off_t size;
-    off_t vsize;
-***************
-*** 895,900 ****
---- 900,906 ----
-    unsigned int quiet : 1;	/* inhibit status messages? */
-    unsigned int collapsed : 1;   /* are all threads collapsed? */
-    unsigned int closing : 1;	/* mailbox is being closed */
-+   unsigned int peekonly : 1;	/* just taking a glance, revert atime */
-  
-    /* driver hooks */
-    void *data;			/* driver specific data */
-*** mutt-1.5.23-orig/muttlib.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/muttlib.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1281,1286 ****
---- 1281,1288 ----
-  	  pl = pw = 1;
-  
-  	/* see if there's room to add content, else ignore */
-+         if ( DrawFullLine )
-+         {
-  	if ((col < COLS && wlen < destlen) || soft)
-  	{
-  	  int pad;
-***************
-*** 1324,1329 ****
---- 1326,1377 ----
-  	  col += wid;
-  	  src += pl;
-  	}
-+         }
-+         else
-+         {
-+ 	if ((col < COLS-SidebarWidth && wlen < destlen) || soft)
-+         {
-+ 	  int pad;
-+ 
-+ 	  /* get contents after padding */
-+ 	  mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags);
-+ 	  len = mutt_strlen (buf);
-+ 	  wid = mutt_strwidth (buf);
-+ 
-+ 	  /* try to consume as many columns as we can, if we don't have
-+ 	   * memory for that, use as much memory as possible */
-+ 	  pad = (COLS - SidebarWidth - col - wid) / pw;
-+ 	  if (pad > 0 && wlen + (pad * pl) + len > destlen)
-+ 	    pad = ((signed)(destlen - wlen - len)) / pl;
-+ 	  if (pad > 0)
-+ 	  {
-+ 	    while (pad--)
-+ 	    {
-+ 	      memcpy (wptr, src, pl);
-+ 	      wptr += pl;
-+ 	      wlen += pl;
-+ 	      col += pw;
-+ 	    }
-+ 	  }
-+ 	  else if (soft && pad < 0)
-+ 	  {
-+ 	    /* \0-terminate dest for length computation in mutt_wstr_trunc() */
-+ 	    *wptr = 0;
-+ 	    /* make sure right part is at most as wide as display */
-+ 	    len = mutt_wstr_trunc (buf, destlen, COLS, &wid);
-+ 	    /* truncate left so that right part fits completely in */
-+ 	    wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col);
-+ 	    wptr = dest + wlen;
-+ 	  }
-+ 	  if (len + wlen > destlen)
-+ 	    len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);
-+ 	  memcpy (wptr, buf, len);
-+ 	  wptr += len;
-+ 	  wlen += len;
-+ 	  col += wid;
-+ 	  src += pl;
-+ 	}
-+         }
-  	break; /* skip rest of input */
-        }
-        else if (ch == '|')
-*** mutt-1.5.23-orig/mx.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mx.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 580,585 ****
---- 580,586 ----
-   *		M_APPEND	open mailbox for appending
-   *		M_READONLY	open mailbox in read-only mode
-   *		M_QUIET		only print error messages
-+  *		M_PEEK		revert atime where applicable
-   *	ctx	if non-null, context struct to use
-   */
-  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
-***************
-*** 602,607 ****
---- 603,610 ----
-      ctx->quiet = 1;
-    if (flags & M_READONLY)
-      ctx->readonly = 1;
-+   if (flags & M_PEEK)
-+     ctx->peekonly = 1;
-  
-    if (flags & (M_APPEND|M_NEWFOLDER))
-    {
-***************
-*** 701,713 ****
-  void mx_fastclose_mailbox (CONTEXT *ctx)
-  {
-    int i;
-  
-    if(!ctx) 
-      return;
-  
-    /* never announce that a mailbox we've just left has new mail. #3290
-     * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
-!   mutt_buffy_setnotified(ctx->path);
-  
-    if (ctx->mx_close)
-      ctx->mx_close (ctx);
---- 704,729 ----
-  void mx_fastclose_mailbox (CONTEXT *ctx)
-  {
-    int i;
-+ #ifndef BUFFY_SIZE
-+   struct utimbuf ut;
-+ #endif
-  
-    if(!ctx) 
-      return;
-+ #ifndef BUFFY_SIZE
-+   /* fix up the times so buffy won't get confused */
-+   if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime)
-+   {
-+     ut.actime = ctx->atime;
-+     ut.modtime = ctx->mtime;
-+     utime (ctx->path, &ut); 
-+   }
-+ #endif
-  
-    /* never announce that a mailbox we've just left has new mail. #3290
-     * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
-!   if(!ctx->peekonly)
-!     mutt_buffy_setnotified(ctx->path);
-  
-    if (ctx->mx_close)
-      ctx->mx_close (ctx);
-***************
-*** 719,724 ****
---- 735,742 ----
-    mutt_clear_threads (ctx);
-    for (i = 0; i < ctx->msgcount; i++)
-      mutt_free_header (&ctx->hdrs[i]);
-+   ctx->msgcount -= ctx->deleted;
-+   set_buffystats(ctx);
-    FREE (&ctx->hdrs);
-    FREE (&ctx->v2r);
-    FREE (&ctx->path);
-***************
-*** 812,817 ****
---- 830,839 ----
-      if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read 
-          && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
-        read_msgs++;
-+     if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read)
-+       ctx->unread--;
-+     if (ctx->hdrs[i]->deleted && ctx->hdrs[i]->flagged)
-+       ctx->flagged--;
-    }
-  
-    if (read_msgs && quadoption (OPT_MOVE) != M_NO)
-*** mutt-1.5.23-orig/mx.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mx.h	2014-04-11 11:11:47.000000000 -0500
-***************
-*** 57,62 ****
---- 57,63 ----
-  int mh_read_dir (CONTEXT *, const char *);
-  int mh_sync_mailbox (CONTEXT *, int *);
-  int mh_check_mailbox (CONTEXT *, int *);
-+ void mh_buffy_update (const char *, int *, int *, int *, time_t *);
-  int mh_check_empty (const char *);
-  
-  int maildir_read_dir (CONTEXT *);
-*** mutt-1.5.23-orig/OPS	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/OPS	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 179,181 ****
---- 179,186 ----
-  OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
-  OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
-  OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
-+ OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
-+ OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
-+ OP_SIDEBAR_NEXT "go down to next mailbox"
-+ OP_SIDEBAR_PREV "go to previous mailbox"
-+ OP_SIDEBAR_OPEN "open hilighted mailbox"
-*** mutt-1.5.23-orig/pager.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/pager.c	2014-04-12 21:53:15.000000000 -0500
-***************
-*** 29,34 ****
---- 29,35 ----
-  #include "pager.h"
-  #include "attach.h"
-  #include "mbyte.h"
-+ #include "sidebar.h"
-  
-  #include "mutt_crypt.h"
-  
-***************
-*** 1095,1100 ****
---- 1096,1102 ----
-    wchar_t wc;
-    mbstate_t mbstate;
-    int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
-+   wrap_cols -= SidebarWidth;
-  
-    if (check_attachment_marker ((char *)buf) == 0)
-      wrap_cols = COLS;
-***************
-*** 1572,1577 ****
---- 1574,1580 ----
-  
-    int bodyoffset = 1;			/* offset of first line of real text */
-    int statusoffset = 0; 		/* offset for the status bar */
-+   int statuswidth;
-    int helpoffset = LINES - 2;		/* offset for the help bar. */
-    int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
-  
-***************
-*** 1746,1752 ****
-      if ((redraw & REDRAW_BODY) || topline != oldtopline)
-      {
-        do {
-! 	move (bodyoffset, 0);
-  	curline = oldtopline = topline;
-  	lines = 0;
-  	force_redraw = 0;
---- 1749,1755 ----
-      if ((redraw & REDRAW_BODY) || topline != oldtopline)
-      {
-        do {
-! 	move (bodyoffset, SidebarWidth);
-  	curline = oldtopline = topline;
-  	lines = 0;
-  	force_redraw = 0;
-***************
-*** 1759,1764 ****
---- 1762,1768 ----
-  			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
-  	    lines++;
-  	  curline++;
-+   	  move(lines + bodyoffset, SidebarWidth);
-  	}
-  	last_offset = lineInfo[curline].offset;
-        } while (force_redraw);
-***************
-*** 1771,1776 ****
---- 1775,1781 ----
-  	  addch ('~');
-  	addch ('\n');
-  	lines++;
-+   	move(lines + bodyoffset, SidebarWidth);
-        }
-        NORMAL_COLOR;
-  
-***************
-*** 1788,1816 ****
-        hfi.ctx = Context;
-        hfi.pager_progress = pager_progress_str;
-  
-        if (last_pos < sb.st_size - 1)
-  	snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));
-        else
-  	strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
-  
-        /* print out the pager status bar */
-!       move (statusoffset, 0);
-        SETCOLOR (MT_COLOR_STATUS);
-  
-        if (IsHeader (extra) || IsMsgAttach (extra))
-        {
-! 	size_t l1 = COLS * MB_LEN_MAX;
-  	size_t l2 = sizeof (buffer);
-  	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
-  	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
-! 	mutt_paddstr (COLS, buffer);
-        }
-        else
-        {
-  	char bn[STRING];
-  	snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
-! 	mutt_paddstr (COLS, bn);
-        }
-        NORMAL_COLOR;
-      }
-  
---- 1793,1831 ----
-        hfi.ctx = Context;
-        hfi.pager_progress = pager_progress_str;
-  
-+       statuswidth = COLS - (option(OPTSTATUSONTOP) && PagerIndexLines > 0 ? SidebarWidth : 0);
-+ 
-        if (last_pos < sb.st_size - 1)
-  	snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));
-        else
-  	strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
-  
-        /* print out the pager status bar */
-!       move (statusoffset, SidebarWidth);
-        SETCOLOR (MT_COLOR_STATUS);
-+       if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) {
-+           CLEARLINE_WIN (statusoffset);
-+       } else {
-+           CLEARLINE (statusoffset);
-+           DrawFullLine = 1; /* for mutt_make_string_info */
-+       }
-  
-        if (IsHeader (extra) || IsMsgAttach (extra))
-        {
-! 	size_t l1 = statuswidth * MB_LEN_MAX;
-  	size_t l2 = sizeof (buffer);
-  	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
-  	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
-! 	mutt_paddstr (statuswidth, buffer);
-        }
-        else
-        {
-  	char bn[STRING];
-  	snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
-! 	mutt_paddstr (statuswidth, bn);
-        }
-+       if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0)
-+           DrawFullLine = 0; /* reset */
-        NORMAL_COLOR;
-      }
-  
-***************
-*** 1819,1834 ****
-        /* redraw the pager_index indicator, because the
-         * flags for this message might have changed. */
-        menu_redraw_current (index);
-  
-        /* print out the index status bar */
-        menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
-   
-!       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
-        SETCOLOR (MT_COLOR_STATUS);
-!       mutt_paddstr (COLS, buffer);
-        NORMAL_COLOR;
-      }
-  
-      redraw = 0;
-  
-      if (option(OPTBRAILLEFRIENDLY)) {
---- 1834,1855 ----
-        /* redraw the pager_index indicator, because the
-         * flags for this message might have changed. */
-        menu_redraw_current (index);
-+       draw_sidebar(MENU_PAGER);
-  
-        /* print out the index status bar */
-        menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
-   
-!       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
-!           (option(OPTSTATUSONTOP) ? 0: SidebarWidth));
-        SETCOLOR (MT_COLOR_STATUS);
-!       mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer);
-        NORMAL_COLOR;
-      }
-  
-+     /* if we're not using the index, update every time */
-+     if ( index == 0 )
-+       draw_sidebar(MENU_PAGER);
-+ 
-      redraw = 0;
-  
-      if (option(OPTBRAILLEFRIENDLY)) {
-***************
-*** 2763,2768 ****
---- 2784,2796 ----
-  	mutt_what_key ();
-  	break;
-  
-+       case OP_SIDEBAR_SCROLL_UP:
-+       case OP_SIDEBAR_SCROLL_DOWN:
-+       case OP_SIDEBAR_NEXT:
-+       case OP_SIDEBAR_PREV:
-+ 	scroll_sidebar(ch, MENU_PAGER);
-+  	break;
-+ 
-        default:
-  	ch = -1;
-  	break;
-*** mutt-1.5.23-orig/pattern.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/pattern.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 154,159 ****
---- 154,163 ----
-    HEADER *h = ctx->hdrs[msgno];
-    char *buf;
-    size_t blen;
-+ #ifdef HAVE_FMEMOPEN
-+   char *temp;
-+   size_t tempsize;
-+ #endif
-  
-    if ((msg = mx_open_message (ctx, msgno)) != NULL)
-    {
-***************
-*** 163,174 ****
---- 167,186 ----
-        memset (&s, 0, sizeof (s));
-        s.fpin = msg->fp;
-        s.flags = M_CHARCONV;
-+ #ifdef HAVE_FMEMOPEN
-+       if((s.fpout = open_memstream(&temp, &tempsize)) == NULL)
-+       {
-+ 	mutt_perror ("Error opening memstream");
-+ 	return (0);
-+       }
-+ #else
-        mutt_mktemp (tempfile, sizeof (tempfile));
-        if ((s.fpout = safe_fopen (tempfile, "w+")) == NULL)
-        {
-  	mutt_perror (tempfile);
-  	return (0);
-        }
-+ #endif
-  
-        if (pat->op != M_BODY)
-  	mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
-***************
-*** 184,190 ****
---- 196,206 ----
-  	  if (s.fpout)
-  	  {
-  	    safe_fclose (&s.fpout);
-+ #ifdef HAVE_FMEMOPEN
-+             FREE(&temp);
-+ #else
-  	    unlink (tempfile);
-+ #endif
-  	  }
-  	  return (0);
-  	}
-***************
-*** 193,203 ****
---- 209,236 ----
-  	mutt_body_handler (h->content, &s);
-        }
-  
-+ #ifdef HAVE_FMEMOPEN
-+       fclose(s.fpout);
-+       lng = tempsize;
-+ 
-+       if(tempsize) {
-+           if ((fp = fmemopen(temp, tempsize, "r")) == NULL) {
-+             mutt_perror ("Error re-opening memstream");
-+             return (0);
-+           }
-+       } else { /* fmemopen cannot handle empty buffers */
-+           if ((fp = safe_fopen ("/dev/null", "r")) == NULL) {
-+             mutt_perror ("Error opening /dev/null");
-+             return (0);
-+           }
-+       }
-+ #else
-        fp = s.fpout;
-        fflush (fp);
-        fseek (fp, 0, 0);
-        fstat (fileno (fp), &st);
-        lng = (long) st.st_size;
-+ #endif
-      }
-      else
-      {
-***************
-*** 244,250 ****
---- 277,288 ----
-      if (option (OPTTHOROUGHSRC))
-      {
-        safe_fclose (&fp);
-+ #ifdef HAVE_FMEMOPEN
-+       if(tempsize)
-+           FREE (&temp);
-+ #else
-        unlink (tempfile);
-+ #endif
-      }
-    }
-  
-*** mutt-1.5.23-orig/PATCHES	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/PATCHES	2014-04-12 12:36:35.000000000 -0500
-***************
-*** 0 ****
---- 1 ----
-+ patch-1.5.23.sidebar.20140412.txt
-*** mutt-1.5.23-orig/protos.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/protos.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 36,41 ****
---- 36,48 ----
-    const char *pager_progress;
-  };
-  
-+ struct sidebar_entry {
-+     char                box[SHORT_STRING];
-+     unsigned int        size;
-+     unsigned int        new;
-+     unsigned int        flagged;
-+ };
-+ 
-  void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
-  
-  int mutt_extract_token (BUFFER *, BUFFER *, int);
-*** mutt-1.5.23-orig/sidebar.c	1969-12-31 18:00:00.000000000 -0600
---- mutt-1.5.23/sidebar.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 0 ****
---- 1,405 ----
-+ /*
-+  * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
-+  * Copyright (C) 2004 Thomer M. Gil <mutt at thomer.com>
-+  * 
-+  *     This program is free software; you can redistribute it and/or modify
-+  *     it under the terms of the GNU General Public License as published by
-+  *     the Free Software Foundation; either version 2 of the License, or
-+  *     (at your option) any later version.
-+  * 
-+  *     This program is distributed in the hope that it will be useful,
-+  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  *     GNU General Public License for more details.
-+  * 
-+  *     You should have received a copy of the GNU General Public License
-+  *     along with this program; if not, write to the Free Software
-+  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-+  */ 
-+ 
-+ 
-+ #if HAVE_CONFIG_H
-+ # include "config.h"
-+ #endif
-+ 
-+ #include "mutt.h"
-+ #include "mutt_menu.h"
-+ #include "mutt_curses.h"
-+ #include "sidebar.h"
-+ #include "buffy.h"
-+ #include <libgen.h>
-+ #include "keymap.h"
-+ #include <stdbool.h>
-+ 
-+ /*BUFFY *CurBuffy = 0;*/
-+ static BUFFY *TopBuffy = 0;
-+ static BUFFY *BottomBuffy = 0;
-+ static int known_lines = 0;
-+ 
-+ void calc_boundaries() {
-+ 
-+     BUFFY *tmp = Incoming;
-+ 
-+ 	int count = LINES - 2 - (option(OPTHELP) ? 1 : 0);
-+ 
-+ 	if ( known_lines != LINES ) {
-+ 		TopBuffy = BottomBuffy = 0;
-+ 		known_lines = LINES;
-+ 	}
-+ 	for ( ; tmp->next != 0; tmp = tmp->next )
-+ 		tmp->next->prev = tmp;
-+ 
-+ 	if ( TopBuffy == 0 && BottomBuffy == 0 )
-+ 		TopBuffy = Incoming;
-+ 	if ( BottomBuffy == 0 ) {
-+ 		BottomBuffy = TopBuffy;
-+ 		while ( --count && BottomBuffy->next )
-+ 			BottomBuffy = BottomBuffy->next;
-+ 	}
-+ 	else if ( TopBuffy == CurBuffy->next ) {
-+ 		BottomBuffy = CurBuffy;
-+ 		tmp = BottomBuffy;
-+ 		while ( --count && tmp->prev)
-+ 			tmp = tmp->prev;
-+ 		TopBuffy = tmp;
-+ 	}
-+ 	else if ( BottomBuffy == CurBuffy->prev ) {
-+ 		TopBuffy = CurBuffy;
-+ 		tmp = TopBuffy;
-+ 		while ( --count && tmp->next )
-+ 			tmp = tmp->next;
-+ 		BottomBuffy = tmp;
-+ 	}
-+ }
-+ 
-+ static const char *
-+ sidebar_format_str (char *dest,
-+ 			size_t destlen,
-+ 			size_t col,
-+ 			char op,
-+ 			const char *src,
-+ 			const char *prefix,
-+ 			const char *ifstring,
-+ 			const char *elsestring,
-+ 			unsigned long data,
-+ 			format_flag flags)
-+ {
-+ /* casting from unsigned long - srsly?! */
-+ struct sidebar_entry *sbe = (struct sidebar_entry *) data;
-+ unsigned int optional;
-+ char fmt[SHORT_STRING], buf[SHORT_STRING];
-+ 
-+ optional = flags & M_FORMAT_OPTIONAL;
-+ 
-+ switch(op) {
-+ 	case 'F':
-+ 		if(!optional) {
-+ 			snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ 			snprintf (dest, destlen, fmt, sbe->flagged);
-+ 		} else if(sbe->flagged == 0) {
-+ 			optional = 0;
-+ 		}
-+ 		break;
-+ 
-+ 	case '!':
-+ 		if(sbe->flagged == 0)
-+ 			mutt_format_s(dest, destlen, prefix, "");
-+ 		if(sbe->flagged == 1)
-+ 			mutt_format_s(dest, destlen, prefix, "!");
-+ 		if(sbe->flagged == 2)
-+ 			mutt_format_s(dest, destlen, prefix, "!!");
-+ 		if(sbe->flagged > 2) {
-+ 			snprintf (buf, sizeof (buf), "%d!", sbe->flagged);
-+ 			mutt_format_s(dest, destlen, prefix, buf);
-+ 		}
-+ 		break;
-+ 
-+ 	case 'S':
-+ 		snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ 		snprintf (dest, destlen, fmt, sbe->size);
-+ 		break;
-+ 
-+ 	case 'N':
-+ 		if(!optional) {
-+ 			snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ 			snprintf (dest, destlen, fmt, sbe->new);
-+ 		} else if(sbe->new == 0) {
-+ 			optional = 0;
-+ 		}
-+ 		break;
-+ 
-+ 	case 'B':
-+ 		mutt_format_s(dest, destlen, prefix, sbe->box);
-+ 		break;
-+ 	}
-+ 
-+ 	if(optional)
-+ 		mutt_FormatString (dest, destlen, col, ifstring, sidebar_format_str, (unsigned long) sbe, flags);
-+ 	else if (flags & M_FORMAT_OPTIONAL)
-+ 		mutt_FormatString (dest, destlen, col, elsestring, sidebar_format_str, (unsigned long) sbe, flags);
-+ 
-+ 	return (src);
-+ }
-+ 
-+ char *make_sidebar_entry(char *box, unsigned int size, unsigned int new, unsigned int flagged) {
-+     static char *entry = 0;
-+     struct sidebar_entry sbe;
-+     int SBvisual;
-+ 
-+     SBvisual = SidebarWidth - strlen(SidebarDelim);
-+     if (SBvisual < 1)
-+         return NULL;
-+ 
-+     sbe.new = new;
-+     sbe.flagged = flagged;
-+     sbe.size = size;
-+     strncpy(sbe.box, box, 31);
-+ 
-+     safe_realloc(&entry, SBvisual + 2);
-+     entry[SBvisual + 1] = '\0';
-+ 
-+     mutt_FormatString (entry, SBvisual+1, 0, SidebarFormat, sidebar_format_str, (unsigned long) &sbe, 0);
-+ 
-+     return entry;
-+ }
-+ 
-+ void set_curbuffy(char buf[LONG_STRING])
-+ {
-+   BUFFY* tmp = CurBuffy = Incoming;
-+ 
-+   if (!Incoming)
-+     return;
-+ 
-+   while(1) {
-+     if(!strcmp(tmp->path, buf) || !strcmp(tmp->realpath, buf)) {
-+       CurBuffy = tmp;
-+       break;
-+     }
-+ 
-+     if(tmp->next)
-+       tmp = tmp->next;
-+     else
-+       break;
-+   }
-+ }
-+ 
-+ int draw_sidebar(int menu) {
-+ 
-+ 	BUFFY *tmp;
-+ #ifndef USE_SLANG_CURSES
-+         attr_t attrs;
-+ #endif
-+         short delim_len = strlen(SidebarDelim);
-+         short color_pair;
-+ 
-+         static bool initialized = false;
-+         static int prev_show_value;
-+         static short saveSidebarWidth;
-+         int lines = 0;
-+         int SidebarHeight;
-+         
-+         if(option(OPTSTATUSONTOP) || option(OPTHELP))
-+                 lines++; /* either one will occupy the first line */
-+ 
-+         /* initialize first time */
-+         if(!initialized) {
-+                 prev_show_value = option(OPTSIDEBAR);
-+                 saveSidebarWidth = SidebarWidth;
-+                 if(!option(OPTSIDEBAR)) SidebarWidth = 0;
-+                 initialized = true;
-+         }
-+ 
-+         /* save or restore the value SidebarWidth */
-+         if(prev_show_value != option(OPTSIDEBAR)) {
-+                 if(prev_show_value && !option(OPTSIDEBAR)) {
-+                         saveSidebarWidth = SidebarWidth;
-+                         SidebarWidth = 0;
-+                 } else if(!prev_show_value && option(OPTSIDEBAR)) {
-+                         mutt_buffy_check(1); /* we probably have bad or no numbers */
-+                         SidebarWidth = saveSidebarWidth;
-+                 }
-+                 prev_show_value = option(OPTSIDEBAR);
-+         }
-+ 
-+ 
-+ /*	if ( SidebarWidth == 0 ) return 0; */
-+        if (SidebarWidth > 0 && option (OPTSIDEBAR)
-+            && delim_len >= SidebarWidth) {
-+          unset_option (OPTSIDEBAR);
-+          /* saveSidebarWidth = SidebarWidth; */
-+          if (saveSidebarWidth > delim_len) {
-+            SidebarWidth = saveSidebarWidth;
-+            mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
-+            sleep (2);
-+          } else {
-+            SidebarWidth = 0;
-+            mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
-+            sleep (4); /* the advise to set a sane value should be seen long enough */
-+          }
-+          saveSidebarWidth = 0;
-+          return (0);
-+        }
-+ 
-+     if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
-+       if (SidebarWidth > 0) {
-+         saveSidebarWidth = SidebarWidth;
-+         SidebarWidth = 0;
-+       }
-+       unset_option(OPTSIDEBAR);
-+       return 0;
-+     }
-+ 
-+         /* get attributes for divider */
-+ 	SETCOLOR(MT_COLOR_STATUS);
-+ #ifndef USE_SLANG_CURSES
-+         attr_get(&attrs, &color_pair, 0);
-+ #else
-+         color_pair = attr_get();
-+ #endif
-+ 	SETCOLOR(MT_COLOR_NORMAL);
-+ 
-+ 	/* draw the divider */
-+ 
-+ 	SidebarHeight =  LINES - 1;
-+ 	if(option(OPTHELP) || !option(OPTSTATUSONTOP))
-+ 		SidebarHeight--;
-+ 
-+ 	for ( ; lines < SidebarHeight; lines++ ) {
-+ 		move(lines, SidebarWidth - delim_len);
-+ 		addstr(NONULL(SidebarDelim));
-+ #ifndef USE_SLANG_CURSES
-+                 mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
-+ #endif
-+ 	}
-+ 
-+ 	if ( Incoming == 0 ) return 0;
-+         lines = 0;
-+         if(option(OPTSTATUSONTOP) || option(OPTHELP))
-+                 lines++; /* either one will occupy the first line */
-+ 
-+ 	if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
-+ 		calc_boundaries(menu);
-+ 	if ( CurBuffy == 0 ) CurBuffy = Incoming;
-+ 
-+ 	tmp = TopBuffy;
-+ 
-+ 	SETCOLOR(MT_COLOR_NORMAL);
-+ 
-+ 	for ( ; tmp && lines < SidebarHeight; tmp = tmp->next ) {
-+ 		if ( tmp == CurBuffy )
-+ 			SETCOLOR(MT_COLOR_INDICATOR);
-+ 		else if ( tmp->msg_unread > 0 )
-+ 			SETCOLOR(MT_COLOR_NEW);
-+ 		else if ( tmp->msg_flagged > 0 )
-+ 		        SETCOLOR(MT_COLOR_FLAGGED);
-+ 		else
-+ 			SETCOLOR(MT_COLOR_NORMAL);
-+ 
-+ 		move( lines, 0 );
-+ 		if ( Context && (!strcmp(tmp->path, Context->path)||
-+ 				 !strcmp(tmp->realpath, Context->path)) ) {
-+ 			tmp->msg_unread = Context->unread;
-+ 			tmp->msgcount = Context->msgcount;
-+ 			tmp->msg_flagged = Context->flagged;
-+ 		}
-+ 		/* check whether Maildir is a prefix of the current folder's path */
-+ 		short maildir_is_prefix = 0;
-+ 		if ( (strlen(tmp->path) > strlen(Maildir)) &&
-+ 			(strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
-+         		maildir_is_prefix = 1;
-+ 		/* calculate depth of current folder and generate its display name with indented spaces */
-+ 		int sidebar_folder_depth = 0;
-+ 		char *sidebar_folder_name;
-+ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
-+ 		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
-+ 			char *tmp_folder_name;
-+ 			int i;
-+ 			tmp_folder_name = tmp->path + strlen(Maildir) + 1;
-+ 			for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
-+  				if (tmp_folder_name[i] == '/'  || tmp_folder_name[i] == '.') sidebar_folder_depth++;
-+ 			}   
-+ 			if (sidebar_folder_depth > 0) {
-+  				if (option(OPTSIDEBARSHORTPATH)) {
-+  					tmp_folder_name = strrchr(tmp->path, '.');
-+  					if (tmp_folder_name == NULL)
-+  						tmp_folder_name = mutt_basename(tmp->path);
-+  					else
-+ 						tmp_folder_name++;
-+  				}
-+  				else
-+  					tmp_folder_name = tmp->path + strlen(Maildir) + 1;
-+  				sidebar_folder_name = malloc(strlen(tmp_folder_name) + sidebar_folder_depth*strlen(NONULL(SidebarIndentStr)) + 1);
-+ 				sidebar_folder_name[0]=0;
-+ 				for (i=0; i < sidebar_folder_depth; i++)
-+ 					strncat(sidebar_folder_name, NONULL(SidebarIndentStr), strlen(NONULL(SidebarIndentStr)));
-+ 				strncat(sidebar_folder_name, tmp_folder_name, strlen(tmp_folder_name));
-+ 			}
-+ 		}
-+ 		printw( "%.*s", SidebarWidth - delim_len + 1,
-+ 			make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
-+ 			tmp->msg_unread, tmp->msg_flagged));
-+ 		if (sidebar_folder_depth > 0)
-+ 		        free(sidebar_folder_name);
-+ 		lines++;
-+ 	}
-+ 	SETCOLOR(MT_COLOR_NORMAL);
-+ 	for ( ; lines < SidebarHeight; lines++ ) {
-+ 		int i = 0;
-+ 		move( lines, 0 );
-+ 		for ( ; i < SidebarWidth - delim_len; i++ )
-+ 			addch(' ');
-+ 	}
-+ 	return 0;
-+ }
-+ 
-+ 
-+ void set_buffystats(CONTEXT* Context)
-+ {
-+         BUFFY *tmp = Incoming;
-+         while(tmp) {
-+                 if(Context && (!strcmp(tmp->path, Context->path) ||
-+                                !strcmp(tmp->realpath, Context->path))) {
-+ 			tmp->msg_unread = Context->unread;
-+ 			tmp->msgcount = Context->msgcount;
-+ 			tmp->msg_flagged = Context->flagged;
-+                         break;
-+                 }
-+                 tmp = tmp->next;
-+         }
-+ }
-+ 
-+ void scroll_sidebar(int op, int menu)
-+ {
-+         if(!SidebarWidth) return;
-+         if(!CurBuffy) return;
-+ 
-+ 	switch (op) {
-+ 		case OP_SIDEBAR_NEXT:
-+ 			if ( CurBuffy->next == NULL ) return;
-+ 			CurBuffy = CurBuffy->next;
-+ 			break;
-+ 		case OP_SIDEBAR_PREV:
-+ 			if ( CurBuffy->prev == NULL ) return;
-+ 			CurBuffy = CurBuffy->prev;
-+ 			break;
-+ 		case OP_SIDEBAR_SCROLL_UP:
-+ 			CurBuffy = TopBuffy;
-+ 			if ( CurBuffy != Incoming ) {
-+ 				calc_boundaries(menu);
-+ 				CurBuffy = CurBuffy->prev;
-+ 			}
-+ 			break;
-+ 		case OP_SIDEBAR_SCROLL_DOWN:
-+ 			CurBuffy = BottomBuffy;
-+ 			if ( CurBuffy->next ) {
-+ 				calc_boundaries(menu);
-+ 				CurBuffy = CurBuffy->next;
-+ 			}
-+ 			break;
-+ 		default:
-+ 			return;
-+ 	}
-+ 	calc_boundaries(menu);
-+ 	draw_sidebar(menu);
-+ }
-+ 
-*** mutt-1.5.23-orig/sidebar.h	1969-12-31 18:00:00.000000000 -0600
---- mutt-1.5.23/sidebar.h	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 0 ****
---- 1,36 ----
-+ /*
-+  * Copyright (C) ????-2004 Justin Hibbits <jrh29 at po.cwru.edu>
-+  * Copyright (C) 2004 Thomer M. Gil <mutt at thomer.com>
-+  * 
-+  *     This program is free software; you can redistribute it and/or modify
-+  *     it under the terms of the GNU General Public License as published by
-+  *     the Free Software Foundation; either version 2 of the License, or
-+  *     (at your option) any later version.
-+  * 
-+  *     This program is distributed in the hope that it will be useful,
-+  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  *     GNU General Public License for more details.
-+  * 
-+  *     You should have received a copy of the GNU General Public License
-+  *     along with this program; if not, write to the Free Software
-+  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-+  */ 
-+ 
-+ #ifndef SIDEBAR_H
-+ #define SIDEBAR_H
-+ 
-+ struct MBOX_LIST {
-+ 	char *path;
-+ 	int msgcount;
-+ 	int new;
-+ } MBLIST;
-+ 
-+ /* parameter is whether or not to go to the status line */
-+ /* used for omitting the last | that covers up the status bar in the index */
-+ int draw_sidebar(int);
-+ void scroll_sidebar(int, int);
-+ void set_curbuffy(char*);
-+ void set_buffystats(CONTEXT*);
-+ 
-+ #endif /* SIDEBAR_H */
-*** mutt-1.5.23-orig/doc/Muttrc	2014-03-12 11:27:11.000000000 -0500
---- mutt-1.5.23/doc/Muttrc	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 657,662 ****
---- 657,682 ----
-  # $crypt_autosign, $crypt_replysign and $smime_is_default.
-  # 
-  # 
-+ # set sidebar_visible=no
-+ #
-+ # Name: sidebar_visible
-+ # Type: boolean
-+ # Default: no
-+ # 
-+ # 
-+ # This specifies whether or not to show sidebar (left-side list of folders).
-+ # 
-+ # 
-+ # set sidebar_width=0
-+ #
-+ # Name: sidebar_width
-+ # Type: number
-+ # Default: 0
-+ # 
-+ # 
-+ # The width of the sidebar.
-+ # 
-+ # 
-  # set crypt_autosign=no
-  #
-  # Name: crypt_autosign
-*** mutt-1.5.23-orig/imap/imap.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/imap/imap.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1514,1520 ****
-  
-      imap_munge_mbox_name (munged, sizeof (munged), name);
-      snprintf (command, sizeof (command),
-! 	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
-  
-      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
-      {
---- 1514,1520 ----
-  
-      imap_munge_mbox_name (munged, sizeof (munged), name);
-      snprintf (command, sizeof (command),
-! 	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
-  
-      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
-      {
-*** mutt-1.5.23-orig/imap/command.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/imap/command.c	2014-04-11 10:14:01.000000000 -0500
-***************
-*** 1012,1017 ****
---- 1012,1024 ----
-  	     opened */
-  	  status->uidnext = oldun;
-  
-+         /* Added to make the sidebar show the correct numbers */
-+         if (status->messages)
-+         {
-+           inc->msgcount = status->messages;
-+           inc->msg_unread = status->unseen;
-+         }
-+ 
-          FREE (&value);
-          return;
-        }

Deleted: trunk/dports/mail/mutt-devel/files/patch-compress-1.5.20.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-compress-1.5.20.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-compress-1.5.20.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,34 +0,0 @@
---- mutt-1.5.20/configure       2009-09-24 19:04:30.055213493 +0900
-+++ mutt-1.5.20+rr.compressed/configure    2009-09-24 19:04:24.394965468 +0900
-@@ -830,6 +830,7 @@
- with_idn
- with_wc_funcs
- enable_full_doc
-+enable_compressed
- '
-       ac_precious_vars='build_alias
- host_alias
-
---- mutt-1.5.20/Makefile.in	2009-09-24 21:41:34.000000000 +0900
-+++ mutt-1.5.20+rr.compressed/Makefile.in	2009-09-24 21:40:48.000000000 +0900
-@@ -15,10 +15,6 @@
- 
- @SET_MAKE@
- 
--mutt_SOURCES += compress.c
--EXTRA_DIST += compress.h
--mutt_OBJECTS += compress.o
--
- 
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
-@@ -394,6 +390,9 @@
- 	ChangeLog mkchangelog.sh mutt_idna.h \
- 	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in
- 
-+mutt_SOURCES += compress.c
-+EXTRA_DIST += compress.h
-+mutt_OBJECTS += compress.o
- EXTRA_SCRIPTS = smime_keys
- mutt_dotlock_SOURCES = mutt_dotlock.c
- mutt_dotlock_LDADD = @LIBOBJS@

Deleted: trunk/dports/mail/mutt-devel/files/patch-smime_keys.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-smime_keys.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-smime_keys.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,75 +0,0 @@
---- a/smime_keys.pl	2005-05-10 17:02:54.000000000 -0500
-+++ b/smime_keys.pl	2005-11-01 16:02:42.000000000 -0600
-@@ -80,6 +80,29 @@
- # 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;
- }
-@@ -90,13 +113,26 @@
-     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";
-+    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, '?');
-+        &add_certificate($file, \$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.");
-@@ -380,9 +416,10 @@
-     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";

Modified: trunk/dports/mail/mutt-devel/files/patch-thunderbird-fix.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-thunderbird-fix.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-thunderbird-fix.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,3 +1,4 @@
+Upstream-Status: Submitted [http://dev.mutt.org/trac/ticket/3285]
 --- a/crypt.c	2009-01-05 11:20:53.000000000 -0800
 +++ b/crypt.c	2009-06-29 16:55:12.000000000 -0700
 @@ -393,7 +393,14 @@

Deleted: trunk/dports/mail/mutt-devel/files/patch-trash-1.5.16.diff
===================================================================
--- trunk/dports/mail/mutt-devel/files/patch-trash-1.5.16.diff	2015-12-07 17:47:01 UTC (rev 143203)
+++ trunk/dports/mail/mutt-devel/files/patch-trash-1.5.16.diff	2015-12-07 17:55:50 UTC (rev 143204)
@@ -1,259 +0,0 @@
-diff --git a/PATCHES b/PATCHES
-index e69de29..6a47dd7 100644
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.16hg.cd.trash_folder.vl.1
-diff --git a/commands.c b/commands.c
-index 2fdcb7f..998f2fd 100644
---- a/commands.c
-+++ b/commands.c
-@@ -688,6 +688,7 @@ int _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int dec
-     if (option (OPTDELETEUNTAG))
-       mutt_set_flag (Context, h, M_TAG, 0);
-   }
-+  mutt_set_flag (Context, h, M_APPENDED, 1);
-   
-   return 0;
- }
-diff --git a/flags.c b/flags.c
-index 732eb01..6cda898 100644
---- a/flags.c
-+++ b/flags.c
-@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
-       {
- 	h->deleted = 0;
-         update = 1;
--	if (upd_ctx) ctx->deleted--;
-+        if (upd_ctx)
-+        {
-+          ctx->deleted--;
-+          if (h->appended)
-+            ctx->appended--;
-+        }
-+        h->appended = 0; /* when undeleting, also reset the appended flag */
- #ifdef USE_IMAP
-         /* see my comment above */
- 	if (ctx->magic == M_IMAP) 
-@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
-       }
-       break;
- 
-+    case M_APPENDED:
-+      if (bf)
-+      {
-+       if (!h->appended)
-+       {
-+         h->appended = 1;
-+         if (upd_ctx) ctx->appended++;
-+       }
-+      }
-+      break;
-+
-     case M_NEW:
- 
-       if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-diff --git a/globals.h b/globals.h
-index 15c0d14..9699a4d 100644
---- a/globals.h
-+++ b/globals.h
-@@ -142,6 +142,7 @@ WHERE char *StChars;
- WHERE char *Status;
- WHERE char *Tempdir;
- WHERE char *Tochars;
-+WHERE char *TrashPath;
- WHERE char *Username;
- WHERE char *Visual;
- 
-diff --git a/imap/message.c b/imap/message.c
-index 77cef6e..aa21819 100644
---- a/imap/message.c
-+++ b/imap/message.c
-@@ -816,6 +816,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);
-+         mutt_set_flag (ctx, ctx->hdrs[n], M_APPENDED, 1);
-           if (option (OPTDELETEUNTAG))
-             mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
-         }
-@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
-     else
-     {
-       mutt_set_flag (ctx, h, M_DELETE, 1);
-+      mutt_set_flag (ctx, h, M_APPENDED, 1);
-       if (option (OPTDELETEUNTAG))
-         mutt_set_flag (ctx, h, M_TAG, 0);
-     }
-diff --git a/init.h b/init.h
-index 2674bef..5f8100f 100644
---- a/init.h
-+++ b/init.h
-@@ -2863,6 +2863,16 @@ struct option_t MuttVars[] = {
-   ** by \fIyou\fP.  The sixth character is used to indicate when a mail
-   ** was sent to a mailing-list you subscribe to (default: L).
-   */
-+  { "trash",           DT_PATH, R_NONE, UL &TrashPath, 0 },
-+  /*
-+  ** .pp
-+  ** If set, this variable specifies the path of the trash folder where the
-+  ** mails marked for deletion will be moved, instead of being irremediably
-+  ** purged.
-+  ** .pp
-+  ** NOTE: When you delete a message in the trash folder, it is really
-+  ** deleted, so that you have a way to clean the trash.
-+  */
- #ifdef USE_SOCKET
-   { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },
-   /*
-diff --git a/mutt.h b/mutt.h
-index 5930e14..9c07161 100644
---- a/mutt.h
-+++ b/mutt.h
-@@ -201,6 +201,7 @@ enum
-   M_DELETE,
-   M_UNDELETE,
-   M_DELETED,
-+  M_APPENDED,
-   M_FLAG,
-   M_TAG,
-   M_UNTAG,
-@@ -711,6 +712,7 @@ typedef struct header
-   unsigned int mime : 1;    		/* has a MIME-Version header? */
-   unsigned int flagged : 1; 		/* marked important? */
-   unsigned int tagged : 1;
-+  unsigned int appended : 1; /* has been saved */
-   unsigned int deleted : 1;
-   unsigned int changed : 1;
-   unsigned int attach_del : 1; 		/* has an attachment marked for deletion */
-@@ -882,6 +884,7 @@ typedef struct _context
-   int new;			/* how many new messages? */
-   int unread;			/* how many unread messages? */
-   int deleted;			/* how many deleted messages */
-+  int appended;                 /* how many saved messages? */
-   int flagged;			/* how many flagged messages */
-   int msgnotreadyet;		/* which msg "new" in pager, -1 if none */
- 
-diff --git a/muttlib.c b/muttlib.c
-index 497b5f8..7860376 100644
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -1384,7 +1384,9 @@ int mutt_save_confirm (const char *s, struct stat *st)
- 
-   if (magic > 0 && !mx_access (s, W_OK))
-   {
--    if (option (OPTCONFIRMAPPEND))
-+    if (option (OPTCONFIRMAPPEND) &&
-+       (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))
-+      /* if we're appending to the trash, there's no point in asking */
-     {
-       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 afa6843..fe1fd1d 100644
---- a/mx.c
-+++ b/mx.c
-@@ -808,6 +808,53 @@ static int sync_mailbox (CONTEXT *ctx, int *index_hint)
-   return rc;
- }
- 
-+/* move deleted mails to the trash folder */
-+static int trash_append (CONTEXT *ctx)
-+{
-+    CONTEXT *ctx_trash;
-+    int i = 0;
-+    struct stat st, stc;
-+
-+    if (!TrashPath || !ctx->deleted ||
-+       (ctx->magic == M_MAILDIR && option (OPTMAILDIRTRASH)))
-+      return 0;
-+
-+    for (;i < ctx->msgcount && (!ctx->hdrs[i]->deleted ||
-+                               ctx->hdrs[i]->appended); i++);
-+    if (i == ctx->msgcount)
-+      return 0; /* nothing to be done */
-+
-+    if (mutt_save_confirm (TrashPath, &st) != 0)
-+    {
-+      mutt_error _("message(s) not deleted");
-+      return -1;
-+    }
-+
-+    if (lstat (ctx->path, &stc) == 0 && stc.st_ino == st.st_ino
-+       && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev)
-+      return 0;  /* we are in the trash folder: simple sync */
-+
-+    if ((ctx_trash = mx_open_mailbox (TrashPath, M_APPEND, NULL)) != NULL)
-+    {
-+      for (i = 0 ; i < ctx->msgcount ; i++)
-+       if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
-+           && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
-+         {
-+           mx_close_mailbox (ctx_trash, NULL);
-+           return -1;
-+         }
-+
-+      mx_close_mailbox (ctx_trash, NULL);
-+    }
-+    else
-+    {
-+      mutt_error _("Can't open trash folder");
-+      return -1;
-+    }
-+
-+    return 0;
-+}
-+
- /* save changes and close mailbox */
- int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
- {
-@@ -943,6 +990,7 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
- 	  if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
- 	  {
- 	    mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
-+            mutt_set_flag (ctx, ctx->hdrs[i], M_APPENDED, 1);
- 	  }
- 	  else
- 	  {
-@@ -964,6 +1012,14 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
-     return 0;
-   }
-   
-+  /* copy mails to the trash before expunging */
-+  if (purge && ctx->deleted)
-+    if (trash_append (ctx) != 0)
-+    {
-+      ctx->closing = 0;
-+      return -1;
-+    }
-+
- #ifdef USE_IMAP
-   /* allow IMAP to preserve the deleted flag across sessions */
-   if (ctx->magic == M_IMAP)
-@@ -1159,6 +1215,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *index_hint)
-   msgcount = ctx->msgcount;
-   deleted = ctx->deleted;
- 
-+  if (purge && ctx->deleted)
-+  {
-+    if (trash_append (ctx) == -1)
-+      return -1;
-+  } 
-+
- #ifdef USE_IMAP
-   if (ctx->magic == M_IMAP)
-     rc = imap_sync_mailbox (ctx, purge, index_hint);
-diff --git a/postpone.c b/postpone.c
-index bcb8607..c367247 100644
---- a/postpone.c
-+++ b/postpone.c
-@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HEADER *hdr, HEADER **cur, char *fcc, size
-   /* finished with this message, so delete it. */
-   mutt_set_flag (PostContext, h, M_DELETE, 1);
- 
-+  /* and consider it saved, so that it won't be moved to the trash folder */
-+  mutt_set_flag (PostContext, h, M_APPENDED, 1);
-+
-   /* update the count for the status display */
-   PostCount = PostContext->msgcount - PostContext->deleted;
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/92a4bb81/attachment-0001.html>


More information about the macports-changes mailing list