From: okazaki <okazaki>
Date: Sat, 13 Feb 2010 18:49:24 +0000 (+0000)
Subject: (smtp-primitive-mailfrom): Fixed two spaces may be used as a separator
X-Git-Tag: flim-1_14-wl-root~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=01307a965ce6dde720353c19ddbf2d70ce4cc485;p=elisp%2Fflim.git

(smtp-primitive-mailfrom): Fixed two spaces may be used as a separator
 before "BODY=8BITMIME".
---

diff --git a/ChangeLog b/ChangeLog
index cdfab51..d3716bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Tetsurou Okazaki  <okazaki@be.to>
+
+	* smtp.el (smtp-primitive-mailfrom): Fixed two spaces may be used
+	as a separator before "BODY=8BITMIME".
+
 2010-02-09  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
 
 	* mel-q-ccl.el (quoted-printable-ccl-encode-string)
diff --git a/smtp.el b/smtp.el
index 994bb47..ba95db6 100644
--- a/smtp.el
+++ b/smtp.el
@@ -555,7 +555,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
     ;; SIZE --- Message Size Declaration (RFC1870)
     (if (and smtp-use-size
 	     (assq 'size extensions))
-	(setq extension (format "SIZE=%d" (smtp-package-buffer-internal-size package))))
+	(setq extension (format " SIZE=%d" (smtp-package-buffer-internal-size package))))
     ;; 8BITMIME --- 8bit-MIMEtransport (RFC1652)
     (if (and smtp-use-8bitmime
 	     (assq '8bitmime extensions))
@@ -563,7 +563,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
     (smtp-send-command
      connection
      (if extension
-	 (format "MAIL FROM:<%s> %s" sender extension)
+	 (format "MAIL FROM:<%s>%s" sender extension)
        (format "MAIL FROM:<%s>" sender)))
     (setq response (smtp-read-response connection))
     (if (/= (car response) 250)