From 89727a7243e611857a42608af7e593b48d786724 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Sat, 22 Apr 2000 08:25:20 +0000 Subject: [PATCH] Fix various inconsistencies with respect to thread deletion. --- curs_main.c | 3 +++ pager.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/curs_main.c b/curs_main.c index bf33e25f..7af10d02 100644 --- a/curs_main.c +++ b/curs_main.c @@ -1569,6 +1569,9 @@ int mutt_index_menu (void) if (rc != -1) { + if (option (OPTDELETEUNTAG)) + mutt_thread_set_flag (CURHDR, M_TAG, 0, + op == OP_DELETE_THREAD ? 0 : 1); if (option (OPTRESOLVE)) if ((menu->current = ci_next_undeleted (menu->current)) == -1) menu->current = menu->oldcurrent; diff --git a/pager.c b/pager.c index dfd5edac..4ea1770a 100644 --- a/pager.c +++ b/pager.c @@ -2099,6 +2099,8 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra) CHECK_MODE(IsHeader (extra)); CHECK_READONLY; mutt_set_flag (Context, extra->hdr, M_DELETE, 1); + if (option (OPTDELETEUNTAG)) + mutt_set_flag (Context, extra->hdr, M_TAG, 0); redraw = REDRAW_STATUS | REDRAW_INDEX; if (option (OPTRESOLVE)) { @@ -2117,10 +2119,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra) if (r != -1) { + if (option (OPTDELETEUNTAG)) + mutt_thread_set_flag (extra->hdr, M_TAG, 0, + ch == OP_DELETE_THREAD ? 0 : 1); if (option (OPTRESOLVE)) { - rc = (ch == OP_DELETE_THREAD) ? - OP_MAIN_NEXT_THREAD : OP_MAIN_NEXT_SUBTHREAD; + rc = OP_MAIN_NEXT_UNDELETED; ch = -1; } -- 2.40.0