Change definition of GET-ALL-HEADER-FIELD-VALUES to return a list of

strings, rather than a comma-separated string.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index 352cd6d4efc056995a2f4979bfd78ca9ac6513f1..c0a950b183b4533a32f7bd92205f35ab46cae3dc 100644 (file)
--- 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.104 2000/06/19 05:00:47 cph Exp $
+;;; $Id: imail-core.scm,v 1.105 2000/06/19 22:06:21 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -684,13 +684,9 @@
         (string-trim (header-field-value header)))))
 
 (define (get-all-header-field-values headers name)
-  (let ((headers (get-all-header-fields headers name)))
-    (and (pair? headers)
-        (decorated-string-append
-         "" ", " ""
-         (map (lambda (header)
-                (string-trim (header-field-value header)))
-              headers)))))
+  (map (lambda (header)
+        (string-trim (header-field-value header)))
+       (get-all-header-fields headers name)))
 \f
 (define (header-field-name? object)
   (and (string? object)

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 569a85e62e267ee1b7f80f17be9ab79eade21428..b10557c36ef5ccd199ff2f9f9e109bf3f48aade7 100644 (file)
--- a/v7/src/imail/imail-top.scm
+++ b/v7/src/imail/imail-top.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-top.scm,v 1.172 2000/06/19 20:27:37 cph Exp $
+;;; $Id: imail-top.scm,v 1.173 2000/06/19 22:06:24 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -1075,22 +1075,26 @@ ADDRESSES is a string consisting of several addresses separated by commas."
 (define (imail-reply-headers message cc?)
   (let ((resent-reply-to
         (get-last-header-field-value message "resent-reply-to" #f))
-       (from (get-first-header-field-value message "from" #f)))
+       (from (get-first-header-field-value message "from" #f))
+       (concat
+        (lambda (strings)
+          (and (pair? strings)
+               (decorated-string-append "" ", " "" strings)))))
     `(("To"
        ,(rfc822:canonicalize-address-string
         (or resent-reply-to
-            (get-all-header-field-values message "reply-to")
+            (concat (get-all-header-field-values message "reply-to"))
             from)))
       ("CC"
        ,(and cc?
             (let ((to
                    (if resent-reply-to
                        (get-last-header-field-value message "resent-to" #f)
-                       (get-all-header-field-values message "to")))
+                       (concat (get-all-header-field-values message "to"))))
                   (cc
                    (if resent-reply-to
                        (get-last-header-field-value message "resent-cc" #f)
-                       (get-all-header-field-values message "cc"))))
+                       (concat (get-all-header-field-values message "cc")))))
               (let ((cc
                      (if (and to cc)
                          (string-append to ", " cc)
@@ -1124,7 +1128,7 @@ ADDRESSES is a string consisting of several addresses separated by commas."
          (if (ref-variable imail-reply-with-re)
              (string-append "Re: " subject)
              subject))))))
-
+\f
 (define (imail-dont-reply-to addresses)
   (let ((pattern
         (re-compile-pattern