From 9fd34070d3abd97237c586fd15cffb7d668890f0 Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Fri, 1 May 2009 12:47:08 +0000
Subject: [PATCH] Write only permanent flags, not all flags, in RMAIL attribute
 lines.

---
 v7/src/imail/imail-rmail.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/v7/src/imail/imail-rmail.scm b/v7/src/imail/imail-rmail.scm
index 83b201a9d..3d848cca0 100644
--- a/v7/src/imail/imail-rmail.scm
+++ b/v7/src/imail/imail-rmail.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: imail-rmail.scm,v 1.79 2008/08/31 23:02:17 riastradh Exp $
+$Id: imail-rmail.scm,v 1.80 2009/05/01 12:47: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,
@@ -280,18 +280,18 @@ USA.
 (define (write-rmail-attributes-line message formatted? port)
   (write-char (if formatted? #\1 #\0) port)
   (write-char #\, port)
-  (call-with-values (lambda () (flags->rmail-markers (message-flags message)))
-    (lambda (attributes labels)
-      (let ((write-markers
-	     (lambda (markers)
-	       (for-each (lambda (marker)
-			   (write-char #\space port)
-			   (write-string marker port)
-			   (write-char #\, port))
-			 markers))))
-	(write-markers attributes)
-	(write-char #\, port)
-	(write-markers labels))))
+  (receive (attributes labels)
+      (flags->rmail-markers (message-permanent-flags message))
+    (let ((write-markers
+	   (lambda (markers)
+	     (for-each (lambda (marker)
+			 (write-char #\space port)
+			 (write-string marker port)
+			 (write-char #\, port))
+		       markers))))
+      (write-markers attributes)
+      (write-char #\, port)
+      (write-markers labels)))
   (newline port))
 
 ;;;; Attributes and labels
-- 
2.25.1