From 1c89075e494c4ce89965dd176a86f82f5b5a862f Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Thu, 25 Sep 2008 15:16:09 +0000
Subject: [PATCH] Discard the deleted flag when filing messages.

---
 v7/src/imail/imail-core.scm | 9 ++++++---
 v7/src/imail/imail-imap.scm | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index a48e51136..d6e0d1585 100644
--- a/v7/src/imail/imail-core.scm
+++ b/v7/src/imail/imail-core.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: imail-core.scm,v 1.177 2008/09/25 14:58:06 riastradh Exp $
+$Id: imail-core.scm,v 1.178 2008/09/25 15:16:08 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -599,9 +599,12 @@ USA.
 	(if folder
 	    (object-modified! folder 'FLAGS message))))))
 
-(define-generic message-permanent-flags (message))
+(define (message-permanent-flags message)
+  (flags-delete "deleted" (%message-permanent-flags message)))
 
-(define-method message-permanent-flags ((message <message>))
+(define-generic %message-permanent-flags (message))
+
+(define-method %message-permanent-flags ((message <message>))
   (message-flags message))
 
 (define (message-attached? message #!optional folder)
diff --git a/v7/src/imail/imail-imap.scm b/v7/src/imail/imail-imap.scm
index f74b5e9e8..829d00a90 100644
--- a/v7/src/imail/imail-imap.scm
+++ b/v7/src/imail/imail-imap.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: imail-imap.scm,v 1.235 2008/09/25 15:00:35 riastradh Exp $
+$Id: imail-imap.scm,v 1.236 2008/09/25 15:16:09 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -1145,7 +1145,7 @@ USA.
 		      (lambda (flag)
 			(flags-member? flag allowed-flags)))))))))))
 
-(define-method message-permanent-flags ((message <imap-message>))
+(define-method %message-permanent-flags ((message <imap-message>))
   ;; Perhaps this should intersect the flags with the folder's list of
   ;; permanent flags, if the folder does not allow permanent
   ;; user-defined flags, in order to preserve only those flags that
-- 
2.25.1