start upgrade to 1.6.0

[packages/mutt.git] / mutt-cd.purge_message.patch

diff --git a/mutt-cd.purge_message.patch b/mutt-cd.purge_message.patch
index 9d290b9a61f66aca381880b909a9a65dda95e395..9d20e359880dcdbbe75fe4041c1af67888816aa2 100644 (file)
--- a/mutt-cd.purge_message.patch
+++ b/mutt-cd.purge_message.patch
@@ -158,7 +158,7 @@ of having a trash folder feature.
            mx_close_mailbox (ctx_trash, NULL);
 --- a/pager.c
 +++ b/pager.c
-@@ -2343,12 +2343,15 @@
+@@ -2351,6 +2351,7 @@
        MAYBE_REDRAW (redraw);
        break;
  
@@ -166,7 +166,8 @@ of having a trash folder feature.
        case OP_DELETE:
        CHECK_MODE(IsHeader (extra));
        CHECK_READONLY;
-       CHECK_ACL(M_ACL_DELETE, _("delete message"));
+@@ -2358,6 +2359,8 @@
+       CHECK_ACL(M_ACL_DELETE, _("Cannot delete message"));
  
        mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
 +      mutt_set_flag (Context, extra->hdr, M_PURGED,