From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 22 Jun 2011 09:13:50 +0000 (+0200)
Subject: (smtpmail-via-smtp): Make sure we don't send QUIT twice.
X-Git-Tag: emacs-pretest-24.0.90~104^2~477
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=396f7c9d288de829438b3d72c5ffb7ceb3bfa655;p=emacs.git

(smtpmail-via-smtp): Make sure we don't send QUIT twice.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfb630c5e3d..e5c2e2ad628 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mail/smtpmail.el (smtpmail-via-smtp): Make sure we don't send
+	QUIT twice.
+
 2011-06-22  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.el (display-buffer-default-specifiers)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 7385eab4977..58a517ba836 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -741,6 +741,7 @@ The list is in preference order.")
 		(smtpmail-send-command process "QUIT")
 		(smtpmail-read-response process)
 		(delete-process process)
+		(setq process nil)
 		(throw 'done
 		       (smtpmail-via-smtp recipient smtpmail-text-buffer t)))
 	       (t
@@ -768,6 +769,7 @@ The list is in preference order.")
 		  (smtpmail-send-command process "QUIT")
 		  (smtpmail-read-response process)
 		  (delete-process process)
+		  (setq process nil)
 		  (throw 'done
 			 (smtpmail-via-smtp recipient smtpmail-text-buffer t)))
 		 (t