[Emacs-diffs] /srv/bzr/emacs/trunk r105815: (smtpmail-via-smtp): Ignore errors that arise when sending QUIT.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105815
fixes bug(s): http://debbugs.gnu.org/9312
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-18 09:36:20 +0200
message:
  (smtpmail-via-smtp): Ignore errors that arise when sending QUIT.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-17 21:28:17 +0000
+++ b/lisp/ChangeLog    2011-09-18 07:36:20 +0000
@@ -1,3 +1,8 @@
+2011-09-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Ignore errors that arise
+       when sending QUIT (bug#9312).
+
 2011-09-17  Chong Yidong  <address@hidden>
 
        * replace.el (occur-mode-map): Rebind occur-edit-mode to "e" (Bug#8463).

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-09-14 22:57:57 +0000
+++ b/lisp/mail/smtpmail.el     2011-09-18 07:36:20 +0000
@@ -773,8 +773,12 @@
                     (eq (car result) 530))
                ;; We got a "530 auth required", so we close and try
                ;; again, this time asking the user for a password.
-               (smtpmail-send-command process "QUIT")
-               (smtpmail-read-response process)
+               ;; We ignore any errors here, because some MTAs just
+               ;; close the connection immediately after giving the
+               ;; error message.
+               (ignore-errors
+                 (smtpmail-send-command process "QUIT")
+                 (smtpmail-read-response process))
                (delete-process process)
                (setq process nil)
                (throw 'done