From: Jason L. Wright <jason.wright@inl.gov>
Date: Wed, 9 May 2012 19:12:20 +0000 (+0200)
Subject: * mail/smtpmail.el (smtpmail-send-command): Send the command and
X-Git-Tag: emacs-24.0.97~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8633b1f4566f01eae2d596436cd97fa687f09051;p=emacs.git

* mail/smtpmail.el (smtpmail-send-command): Send the command and
the following \r\n using a single `process-send-string', since the
Lotus SMTP server refuses to accept any commands if they are sent
with two `process-send-string's.

Fixes: debbugs:11444
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d72e098579c..8e6a3c0f106 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-09  Jason L. Wright  <jason.wright@inl.gov>  (tiny change)
+
+	* mail/smtpmail.el (smtpmail-send-command): Send the command and
+	the following \r\n using a single `process-send-string', since the
+	Lotus SMTP server refuses to accept any commands if they are sent
+	with two `process-send-string's (bug#11444).
+
 2012-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* shell.el (shell-parse-pcomplete-arguments): Obey
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 8e96e2c9438..804fe7a8798 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -932,8 +932,7 @@ Returns an error if the server cannot be contacted."
       (insert (match-string 0 command) "<omitted>\r\n")
     (insert command "\r\n"))
   (setq smtpmail-read-point (point))
-  (process-send-string process command)
-  (process-send-string process "\r\n"))
+  (process-send-string process (concat command "\r\n")))
 
 (defun smtpmail-send-data-1 (process data)
   (goto-char (point-max))