summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/smtpmail.el8
2 files changed, 9 insertions, 4 deletions
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 <larsi@gnus.org>
+
+ * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the
+ way the ports list is computed.
+
2012-02-14 Teodor Zlatanov <tzz@lifelogs.com>
* 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 ()