From: Lars Ingebrigtsen Date: Tue, 14 Feb 2012 15:31:49 +0000 (+0100) Subject: Respect smtpmail-smtp-service when doing a trial connection X-Git-Tag: emacs-pretest-24.0.94~139 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d29b2b4cb7b0c4c6f4d5c20be427996865561b03;p=emacs.git Respect smtpmail-smtp-service when doing a trial connection * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the way the ports list is computed. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94f5ebcb600..437b3e30f2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-14 Lars Ingebrigtsen + + * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the + way the ports list is computed. + 2012-02-14 Teodor Zlatanov * net/gnutls.el (gnutls-trustfiles): Add Cygwin location. diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 99283bebf9d..fcec5008c98 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -597,11 +597,11 @@ The list is in preference order.") (defun smtpmail-query-smtp-server () (let ((server (read-string "Outgoing SMTP mail server: ")) - (ports '("smtp" 587)) + (ports '(25 587)) stream port) - (when (and smtpmail-smtp-server - (not (member smtpmail-smtp-server ports))) - (push smtpmail-smtp-server ports)) + (when (and smtpmail-smtp-service + (not (member smtpmail-smtp-service ports))) + (push smtpmail-smtp-service ports)) (while (and (not smtpmail-smtp-server) (setq port (pop ports))) (when (setq stream (condition-case ()