diff -pruN1 mutt-1.3.27-trash_folder/OPS mutt-1.3.27-purge_message/OPS --- mutt-1.3.27-trash_folder/OPS Tue Sep 11 12:50:50 2001 +++ mutt-1.3.27-purge_message/OPS Sat Feb 2 23:14:54 2002 @@ -136,2 +136,3 @@ 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" diff -pruN1 mutt-1.3.27-trash_folder/curs_main.c mutt-1.3.27-purge_message/curs_main.c --- mutt-1.3.27-trash_folder/curs_main.c Wed Jan 16 21:43:58 2002 +++ mutt-1.3.27-purge_message/curs_main.c Sat Feb 2 23:14:54 2002 @@ -1615,2 +1615,3 @@ int mutt_index_menu (void) + case OP_PURGE_MESSAGE: case OP_DELETE: @@ -1623,2 +1624,3 @@ int mutt_index_menu (void) mutt_tag_set_flag (M_DELETE, 1); + mutt_tag_set_flag (M_PURGED, (op != OP_PURGE_MESSAGE) ? 0 : 1); if (option (OPTDELETEUNTAG)) @@ -1630,2 +1632,4 @@ int mutt_index_menu (void) mutt_set_flag (Context, CURHDR, M_DELETE, 1); + mutt_set_flag (Context, CURHDR, M_PURGED, + (op != OP_PURGE_MESSAGE) ? 0 : 1); if (option (OPTDELETEUNTAG)) @@ -1908,2 +1912,3 @@ int mutt_index_menu (void) mutt_tag_set_flag (M_DELETE, 0); + mutt_tag_set_flag (M_PURGED, 0); menu->redraw = REDRAW_INDEX; @@ -1913,2 +1918,3 @@ int mutt_index_menu (void) mutt_set_flag (Context, CURHDR, M_DELETE, 0); + mutt_set_flag (Context, CURHDR, M_PURGED, 0); if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) @@ -1932,5 +1938,7 @@ int mutt_index_menu (void) 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) { diff -pruN1 mutt-1.3.27-trash_folder/flags.c mutt-1.3.27-purge_message/flags.c --- mutt-1.3.27-trash_folder/flags.c Sat Feb 2 23:11:39 2002 +++ mutt-1.3.27-purge_message/flags.c Sat Feb 2 23:14:54 2002 @@ -88,2 +88,12 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE + case M_PURGED: + if (bf) + { + if (!h->purged) + h->purged = 1; + } + else if (h->purged) + h->purged = 0; + break; + case M_NEW: diff -pruN1 mutt-1.3.27-trash_folder/functions.h mutt-1.3.27-purge_message/functions.h --- mutt-1.3.27-trash_folder/functions.h Tue Sep 11 12:51:39 2001 +++ mutt-1.3.27-purge_message/functions.h Sat Feb 2 23:14:54 2002 @@ -100,2 +100,3 @@ struct binding_t OpMain[] = { { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" }, + { "purge-message", OP_PURGE_MESSAGE, NULL }, { "query", OP_QUERY, "Q" }, @@ -184,2 +185,3 @@ struct binding_t OpPager[] = { { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" }, + { "purge-message", OP_PURGE_MESSAGE, NULL }, { "quit", OP_QUIT, "Q" }, diff -pruN1 mutt-1.3.27-trash_folder/mutt.h mutt-1.3.27-purge_message/mutt.h --- mutt-1.3.27-trash_folder/mutt.h Sat Feb 2 23:11:39 2002 +++ mutt-1.3.27-purge_message/mutt.h Sat Feb 2 23:14:54 2002 @@ -187,2 +187,3 @@ enum M_APPENDED, + M_PURGED, M_FLAG, @@ -621,2 +622,3 @@ typedef struct header unsigned int appended : 1; /* has been saved */ + unsigned int purged : 1; /* bypassing the trash folder */ unsigned int deleted : 1; diff -pruN1 mutt-1.3.27-trash_folder/mx.c mutt-1.3.27-purge_message/mx.c --- mutt-1.3.27-trash_folder/mx.c Sat Feb 2 23:11:39 2002 +++ mutt-1.3.27-purge_message/mx.c Sat Feb 2 23:14:54 2002 @@ -841,2 +841,3 @@ static int trash_append (CONTEXT *ctx) 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) diff -pruN1 mutt-1.3.27-trash_folder/pager.c mutt-1.3.27-purge_message/pager.c --- mutt-1.3.27-trash_folder/pager.c Sun Jan 13 09:49:39 2002 +++ mutt-1.3.27-purge_message/pager.c Sat Feb 2 23:14:54 2002 @@ -2153,2 +2153,3 @@ mutt_pager (const char *banner, const ch + case OP_PURGE_MESSAGE: case OP_DELETE: @@ -2157,2 +2158,4 @@ mutt_pager (const char *banner, const ch 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)) @@ -2466,2 +2469,3 @@ mutt_pager (const char *banner, const ch mutt_set_flag (Context, extra->hdr, M_DELETE, 0); + mutt_set_flag (Context, extra->hdr, M_PURGED, 0); redraw = REDRAW_STATUS | REDRAW_INDEX; @@ -2480,5 +2484,7 @@ mutt_pager (const char *banner, const ch 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) { diff -pruN1 mutt-1.3.27-trash_folder/pattern.c mutt-1.3.27-purge_message/pattern.c --- mutt-1.3.27-trash_folder/pattern.c Sun Jan 13 01:23:56 2002 +++ mutt-1.3.27-purge_message/pattern.c Sat Feb 2 23:14:54 2002 @@ -1175,4 +1175,6 @@ int mutt_pattern_func (int op, char *pro { - 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, diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES --- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:52 2001 +++ mutt-1.3.27/PATCHES Thu Dec 6 16:27:55 2001 @@ -1,0 +1 @@ +patch-1.3.27.cd.purge_message.3