Prefer port smtp over port 587 when sending mail.

* mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
before 587, since it appears that that's more likely to work for
more people.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65530d5e5e24582a516ac7aba05c46587b22ee9c..03c4f1dab02a3bc116a45ab9ab3dc363ab163287 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
+       before 587, since it appears that that's more likely to work for
+       more people.
+
        * cus-edit.el (custom-file): When running under emacs -q, always
        refuse to save the customisations, even if the .emacs file doesn't
        exist.

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index cc46660712f7c03cd935f8b1614d0e5abf420376..3b406fa9331b686524ba7fec2c4aee70006b6dbb 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -589,7 +589,7 @@ The list is in preference order.")
 
 (defun smtpmail-query-smtp-server ()
   (let ((server (read-string "Outgoing SMTP mail server: "))
-       (ports '(587 "smtp"))
+       (ports '("smtp" 587))
        stream port)
     (when (and smtpmail-smtp-server
               (not (member smtpmail-smtp-server ports)))