aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason L. Wright2012-05-09 21:12:20 +0200
committerLars Magne Ingebrigtsen2012-05-09 21:12:20 +0200
commit8633b1f4566f01eae2d596436cd97fa687f09051 (patch)
tree3367a45fd456438a1ef8ced3924c045614ab2a4b
parentfe263b8f57f4f55e17a4a39f36e52f585e0cba70 (diff)
downloademacs-8633b1f4566f01eae2d596436cd97fa687f09051.tar.gz
emacs-8633b1f4566f01eae2d596436cd97fa687f09051.zip
* 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
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/mail/smtpmail.el3
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d72e098579c..8e6a3c0f106 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-05-09 Jason L. Wright <jason.wright@inl.gov> (tiny change)
2
3 * mail/smtpmail.el (smtpmail-send-command): Send the command and
4 the following \r\n using a single `process-send-string', since the
5 Lotus SMTP server refuses to accept any commands if they are sent
6 with two `process-send-string's (bug#11444).
7
12012-05-09 Stefan Monnier <monnier@iro.umontreal.ca> 82012-05-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 9
3 * shell.el (shell-parse-pcomplete-arguments): Obey 10 * 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."
932 (insert (match-string 0 command) "<omitted>\r\n") 932 (insert (match-string 0 command) "<omitted>\r\n")
933 (insert command "\r\n")) 933 (insert command "\r\n"))
934 (setq smtpmail-read-point (point)) 934 (setq smtpmail-read-point (point))
935 (process-send-string process command) 935 (process-send-string process (concat command "\r\n")))
936 (process-send-string process "\r\n"))
937 936
938(defun smtpmail-send-data-1 (process data) 937(defun smtpmail-send-data-1 (process data)
939 (goto-char (point-max)) 938 (goto-char (point-max))