Experimental patch to make maildir_trash handling more consistent.

diff --git a/mh.c b/mh.c
index 5ff5b406e59c501de52b4110811ee6667974ca85..df17522e0819cec035adbf34c983a2650a442971 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -1188,7 +1188,7 @@ int mh_sync_mailbox (CONTEXT * ctx, int *index_hint)
   {
     for (i = 0, j = 0; i < ctx->msgcount; i++)
     {
-      if (!ctx->hdrs[i]->deleted)
+      if (!ctx->hdrs[i]->deleted || (ctx->magic == M_MAILDIR && option (OPTMAILDIRTRASH)))
        ctx->hdrs[i]->index = j++;
     }
   }
@@ -1230,7 +1230,7 @@ int mh_check_mailbox(CONTEXT *ctx, int *index_hint)
   struct maildir *md, *p;
   struct maildir **last;
   HASH *fnames;
-  int i, j, deleted;
+  int i, j;
   
   if(!option (OPTCHECKNEW))
     return 0;
@@ -1341,7 +1341,6 @@ int mh_check_mailbox(CONTEXT *ctx, int *index_hint)
     hash_insert(fnames, p->canon_fname, p, 0);
   }
 
-  deleted = 0;
   
   for(i = 0; i < ctx->msgcount; i++)
   {

diff --git a/mx.c b/mx.c
index d5029b5c727de4c46f6e6921ab1c2827b562ab75..d97d2bd76f05f47c15830b0c037327e792ab7277 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1041,7 +1041,8 @@ void mx_update_tables(CONTEXT *ctx, int committing)
 #define this_body ctx->hdrs[j]->content
   for (i = 0, j = 0; i < ctx->msgcount; i++)
   {
-    if ((committing && !ctx->hdrs[i]->deleted) || 
+    if ((committing && (!ctx->hdrs[i]->deleted || 
+                       (ctx->magic == M_MAILDIR && option (OPTMAILDIRTRASH)))) ||
        (!committing && ctx->hdrs[i]->active))
     {
       if (i != j)