[Emacs-diffs] /srv/bzr/emacs/trunk r107282: Respect smtpmail-smtp-service when doing a trial connection

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107282
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-14 16:31:49 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-14 13:13:24 +0000
+++ b/lisp/ChangeLog    2012-02-14 15:31:49 +0000
@@ -1,3 +1,8 @@
+2012-02-14  Lars Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the
+       way the ports list is computed.
+
 2012-02-14  Teodor Zlatanov  <address@hidden>
 
        * net/gnutls.el (gnutls-trustfiles): Add Cygwin location.

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2012-02-09 22:42:12 +0000
+++ b/lisp/mail/smtpmail.el     2012-02-14 15:31:49 +0000
@@ -597,11 +597,11 @@
 
 (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 ()