Fix bug: WRITE-HEADER-FIELDS was generating the blank-line separator,

but all of the callers assumed that it wasn't.  So messages were being
written with an extra newline.

diff --git a/v7/src/imail/imail-core.scm b/v7/src/imail/imail-core.scm
index d88744327ead766d2a53e77f7fd72f48210b32dd..fe81600462f1d446586a3029637df913e89c9380 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.113 2000/08/05 01:53:36 cph Exp $
+;;; $Id: imail-core.scm,v 1.114 2000/10/20 00:44:28 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -485,7 +485,6 @@
   (with-string-output-port
     (lambda (port)
       (write-header-fields (message-header-fields message) port)
-      (newline port)
       (write-message-body message port))))
 \f
 ;;;; Message Navigation

diff --git a/v7/src/imail/imail-rmail.scm b/v7/src/imail/imail-rmail.scm
index 498009605eb2e761ba86d60a6cf2ddffc3b19267..360103a61ef21b209aa91ef6a4e1cb1204282ce4 100644 (file)
--- 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.50 2000/09/11 21:55:16 cph Exp $
+;;; $Id: imail-rmail.scm,v 1.51 2000/10/20 00:44:31 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -261,14 +261,10 @@
        (displayed-headers (rmail-message-displayed-header-fields message)))
     (let ((formatted? (not (eq? 'UNDEFINED displayed-headers))))
       (write-rmail-attributes-line message formatted? port)
-      (if formatted?
-         (begin
-           (write-header-fields headers port)
-           (newline port)))
+      (if formatted? (write-header-fields headers port))
       (write-string rmail-message:headers-separator port)
       (newline port)
       (write-header-fields (if formatted? displayed-headers headers) port)
-      (newline port)
       (write-message-body message port)
       (fresh-line port)
       (write-char rmail-message:end-char port))))

diff --git a/v7/src/imail/imail-umail.scm b/v7/src/imail/imail-umail.scm
index 564a064fa61719344806b19ecbe1fc4ef1e7ed02..d783da7df18b8f066e9867be7707a969e3d41dbf 100644 (file)
--- a/v7/src/imail/imail-umail.scm
+++ b/v7/src/imail/imail-umail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-umail.scm,v 1.39 2000/10/19 21:37:38 cph Exp $
+;;; $Id: imail-umail.scm,v 1.40 2000/10/20 00:44:34 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -181,7 +181,6 @@
       (write-header-field (message-flags->header-field (message-flags message))
                          port))
   (write-header-fields (message-header-fields message) port)
-  (newline port)
   (for-each (lambda (line)
              (if (string-prefix-ci? "From " line)
                  (write-string ">" port))