Ticket #20412: patch-1.5.20.cd.purge_message.diff

mutt-1.5.

@@ -141 +141 @@
 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"

curs_main.c

@@ -1803 +1803 @@
         MAYBE_REDRAW (menu->redraw);
         break;
 
+      case OP_PURGE_MESSAGE:
       case OP_DELETE:
 
         CHECK_MSGCOUNT;
@@ -1813 +1814 @@
         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 +1822 @@
         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 +2120 @@
         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 +2147 @@
         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))
           {

mutt-1.5.

@@ -104 +104 @@
       }
       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))

functions.h

@@ -120 +120 @@
   { "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 +210 @@
   { "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" },

mutt-1.5.

@@ -188 +188 @@
   M_UNDELETE,
   M_DELETED,
   M_APPENDED,
+  M_PURGED,
   M_FLAG,
   M_TAG,
   M_UNTAG,
@@ -704 +705 @@
   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;

mutt-1.5.

@@ -803 +803 @@
     {
       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);

mutt-1.5.

@@ -2309 +2309 @@
         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 +2644 @@
         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 +2660 @@
         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))
           {

pattern.c

@@ -1347 +1347 @@
       {
         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;