[Emacs-diffs] /srv/bzr/emacs/trunk r104670: (smtpmail-via-smtp): Make sure we don't send QUIT twice.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104670
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-06-22 11:13:50 +0200
message:
  (smtpmail-via-smtp): Make sure we don't send QUIT twice.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-22 07:12:18 +0000
+++ b/lisp/ChangeLog    2011-06-22 09:13:50 +0000
@@ -1,3 +1,8 @@
+2011-06-22  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Make sure we don't send
+       QUIT twice.
+
 2011-06-22  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-default-specifiers)

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-06-21 22:55:52 +0000
+++ b/lisp/mail/smtpmail.el     2011-06-22 09:13:50 +0000
@@ -741,6 +741,7 @@
                (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 @@
                  (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