mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

* lisp/mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc.

Browse Source
This commit is contained in:
Glenn Morris 2012-02-14 13:22:47 -05:00
parent 3d8badf411
commit 6546b13405
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-14 Glenn Morris <rgm@gnu.org>
* mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc.
2012-02-14 Lars Ingebrigtsen <larsi@gnus.org>
* mail/smtpmail.el (smtpmail-query-smtp-server): Fix typo in the

11
lisp/mail/smtpmail.el
View File

@ -1,6 +1,6 @@
;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
;; Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc.
;; Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc.
;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
;; Maintainer: Simon Josefsson <simon@josefsson.org>
@ -596,6 +596,12 @@ The list is in preference order.")
(mapconcat 'identity (cdr response) "\n"))
(defun smtpmail-query-smtp-server ()
"Query for an SMTP server and try to contact it.
If the contact succeeds, customizes and saves `smtpmail-smtp-server'
and `smtpmail-smtp-service'. This tries standard SMTP ports, and if
none works asks you to supply one. If you know that you need to use
a non-standard port, you can set `smtpmail-smtp-service' in advance.
Returns an error if the server cannot be contacted."
(let ((server (read-string "Outgoing SMTP mail server: "))
(ports '(25 587))
stream port prompted)
@ -608,8 +614,7 @@ The list is in preference order.")
(open-network-stream "smtp" nil server port)
(quit nil)
(error nil))))
;; We've used up the list of default ports, so query the
;; user.
;; We've used up the list of default ports, so query the user.
(when (and (not ports)
(not prompted))
(push (read-number (format "Port number to use when contacting %s? "