[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105524: (smtpmail-query-smtp-server)
From: |
Lars Magne Ingebrigtsen |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105524: (smtpmail-query-smtp-server): Allow `quit'-ing out in case the probe hangs. |
Date: |
Sun, 21 Aug 2011 22:29:11 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105524
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-21 22:29:11 +0200
message:
(smtpmail-query-smtp-server): Allow `quit'-ing out in case the probe hangs.
modified:
lisp/ChangeLog
lisp/mail/smtpmail.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-08-21 20:10:29 +0000
+++ b/lisp/ChangeLog 2011-08-21 20:29:11 +0000
@@ -4,6 +4,8 @@
`coding-system-for-*' around the process open call to avoid
auth-source side effects.
(smtpmail-try-auth-methods): Expand the secret password.
+ (smtpmail-query-smtp-server): Allow `quit'-ing out in case the
+ probe hangs.
2011-08-21 Chong Yidong <address@hidden>
=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el 2011-08-21 20:10:29 +0000
+++ b/lisp/mail/smtpmail.el 2011-08-21 20:29:11 +0000
@@ -602,8 +602,10 @@
(push smtpmail-smtp-server ports))
(while (and (not smtpmail-smtp-server)
(setq port (pop ports)))
- (when (setq stream (ignore-errors
- (open-network-stream "smtp" nil server port)))
+ (when (setq stream (condition-case ()
+ (open-network-stream "smtp" nil server port)
+ (quit nil)
+ (error nil)))
(customize-save-variable 'smtpmail-smtp-server server)
(customize-save-variable 'smtpmail-smtp-service port)
(delete-process stream)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105524: (smtpmail-query-smtp-server): Allow `quit'-ing out in case the probe hangs.,
Lars Magne Ingebrigtsen <=