diff -pruN mutt-1.5.1.trash/OPS mutt-1.5.1.purge/OPS --- mutt-1.5.1.trash/OPS Thu Apr 25 15:26:01 2002 +++ mutt-1.5.1.purge/OPS Thu May 2 20:06:14 2002 @@ -134,6 +134,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" +patch-1.3.99.cd.purge_message.3 diff -pruN mutt-1.5.1.trash/curs_main.c mutt-1.5.1.purge/curs_main.c --- mutt-1.5.1.trash/curs_main.c Thu Feb 28 09:23:32 2002 +++ mutt-1.5.1.purge/curs_main.c Thu May 2 20:06:14 2002 @@ -1624,6 +1624,7 @@ int mutt_index_menu (void) MAYBE_REDRAW (menu->redraw); break; + case OP_PURGE_MESSAGE: case OP_DELETE: CHECK_MSGCOUNT; @@ -1632,6 +1633,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; @@ -1639,6 +1641,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)) @@ -1923,11 +1927,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++; @@ -1947,9 +1953,11 @@ int mutt_index_menu (void) CHECK_READONLY; 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.1.trash/flags.c mutt-1.5.1.purge/flags.c --- mutt-1.5.1.trash/flags.c Thu May 2 20:05:52 2002 +++ mutt-1.5.1.purge/flags.c Thu May 2 20:06:14 2002 @@ -92,6 +92,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 (bf) { diff -pruN mutt-1.5.1.trash/functions.h mutt-1.5.1.purge/functions.h --- mutt-1.5.1.trash/functions.h Thu Jan 24 22:12:15 2002 +++ mutt-1.5.1.purge/functions.h Thu May 2 20:06:14 2002 @@ -98,6 +98,7 @@ struct binding_t OpMain[] = { { "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" }, @@ -184,6 +185,7 @@ struct binding_t OpPager[] = { { "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.1.trash/mutt.h mutt-1.5.1.purge/mutt.h --- mutt-1.5.1.trash/mutt.h Thu May 2 20:05:52 2002 +++ mutt-1.5.1.purge/mutt.h Thu May 2 20:06:14 2002 @@ -186,6 +186,7 @@ enum M_UNDELETE, M_DELETED, M_APPENDED, + M_PURGED, M_FLAG, M_TAG, M_UNTAG, @@ -640,6 +641,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.1.trash/mx.c mutt-1.5.1.purge/mx.c --- mutt-1.5.1.trash/mx.c Thu May 2 20:05:52 2002 +++ mutt-1.5.1.purge/mx.c Thu May 2 20:06:14 2002 @@ -849,6 +849,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.1.trash/pager.c mutt-1.5.1.purge/pager.c --- mutt-1.5.1.trash/pager.c Thu Jan 24 22:12:18 2002 +++ mutt-1.5.1.purge/pager.c Thu May 2 20:06:14 2002 @@ -2155,10 +2155,13 @@ mutt_pager (const char *banner, const ch MAYBE_REDRAW (redraw); break; + case OP_PURGE_MESSAGE: case OP_DELETE: CHECK_MODE(IsHeader (extra)); CHECK_READONLY; 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; @@ -2468,6 +2471,7 @@ mutt_pager (const char *banner, const ch CHECK_MODE(IsHeader (extra)); CHECK_READONLY; 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)) { @@ -2482,9 +2486,11 @@ mutt_pager (const char *banner, const ch CHECK_READONLY; 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.1.trash/pattern.c mutt-1.5.1.purge/pattern.c --- mutt-1.5.1.trash/pattern.c Thu Apr 25 15:26:01 2002 +++ mutt-1.5.1.purge/pattern.c Thu May 2 20:06:15 2002 @@ -1184,8 +1184,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; diff -pruN mutt-1.5.1.trash/PATCHES mutt-1.5.1.purge/PATCHES --- mutt-1.5.1.trash/PATCHES Thu May 2 20:05:52 2002 +++ mutt-1.5.1.purge/PATCHES Thu May 2 20:06:15 2002 @@ -1,0 +1 @@ +patch-1.5.1.cd.purge_message.3