summaryrefslogtreecommitdiff
path: root/lisp/mail/smtpmail.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2012-02-14 16:31:49 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2012-02-14 16:31:49 +0100
commitd29b2b4cb7b0c4c6f4d5c20be427996865561b03 (patch)
treea69146f1c36f207ce40b9bbc654b2318ee846fcd /lisp/mail/smtpmail.el
parent6a24cbb1a20b7d53fbe29ea4feb34a42cf083948 (diff)
downloademacs-d29b2b4cb7b0c4c6f4d5c20be427996865561b03.tar.gz
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.
Diffstat (limited to 'lisp/mail/smtpmail.el')
-rw-r--r--lisp/mail/smtpmail.el8
1 files changed, 4 insertions, 4 deletions
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 ()