@@ -1,3 +1,7 @@

+2001-08-10  John Foderaro  <jkf@tiger.franz.com>

+

+	* imap.cl - fix problems of too many #\returns in the header

+

 2001-06-26  John Foderaro  <jkf@tiger.franz.com>

 	*  imap.cl - fix typo in exported identifier

@@ -23,7 +23,7 @@

 ;; Suite 330, Boston, MA  02111-1307  USA

 ;;

 ;;

-;; $Id: smtp.cl,v 1.4 2001/05/11 16:40:30 jkf Exp $

+;; $Id: smtp.cl,v 1.5 2001/08/10 15:00:59 jkf Exp $

 ;; Description:

 ;;   send mail to an smtp server.  See rfc821 for the spec.

@@ -209,7 +209,8 @@

-	  (let ((at-bol t))

+	  (let ((at-bol t) 

+		(prev-ch nil))

 	    (dolist (message messages)

 	      (dotimes (i (length message))

 		(let ((ch (aref message i)))

@@ -218,9 +219,11 @@

 			  (write-char #\. sock))

 		  (if* (eq ch #\newline)

 		     then (setq at-bol t)

-			  (write-char #\return sock)

+			  (if* (not (eq prev-ch #\return))

+			     then (write-char #\return sock))

 		     else (setq at-bol nil))

-		  (write-char ch sock)))))

+		  (write-char ch sock)

+		  (setq prev-ch ch)))))

 	  (write-char #\return sock) (write-char #\linefeed sock)

 	  (write-char #\. sock)