patch.me.maildir_trash.1

1 files changed, 22 insertions, 0 deletions

diff --git a/flags.c b/flags.c
index 879e739c..60ae4c7e 100644
--- a/flags.c
+++ b/flags.c
@@ -38,6 +38,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 	if (!h->deleted)
 	{
 	  h->deleted = 1;
+	  if (ctx->magic == M_MAILDIR && option(OPTMAILDIRTRASH))
+	  {
+	      /* As with the IMAP comment below, we need to mark the
+	       * message and mailbox as changed, because deleting a message
+	       * just changes its status on disk without actually deleting
+	       * it.  Without this, the 'T' flag would never get set when
+	       * the maildir box is synched.
+	       */
+	      h->changed  = 1;
+	      if (upd_ctx) ctx->changed = 1;
+	  }
 	  if (upd_ctx) ctx->deleted++;
 #ifdef USE_IMAP
           /* deleted messages aren't treated as changed elsewhere so that the
@@ -54,6 +65,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       {
 	h->deleted = 0;
 	if (upd_ctx) ctx->deleted--;
+	  if (ctx->magic == M_MAILDIR && option(OPTMAILDIRTRASH))
+	  {
+	      /* As with the IMAP comment below, we need to mark the
+	       * message and mailbox as changed, because deleting a message
+	       * just changes its status on disk without actually deleting
+	       * it.  Without this, the 'T' flag would never get set when
+	       * the maildir box is synched.
+	       */
+	      h->changed  = 1;
+	      if (upd_ctx) ctx->changed = 1;
+	  }
 #ifdef USE_IMAP
         /* see my comment above */
 	if (ctx->magic == M_IMAP)