Commit 6bbfa6e1 authored by Chong Yidong's avatar Chong Yidong
Browse files

* lisp/mail/sendmail.el (sendmail-query-once): Tweak prompt message

putting the argument choices in front and in bold.
parent c7b08b0d
2011-10-15 Chong Yidong <cyd@stupidchicken.com>
* mail/sendmail.el (sendmail-query-once): Tweak prompt message,
putting the input text in front and in bold.
2011-10-14 Stefan Monnier <monnier@iro.umontreal.ca>
* pcmpl-unix.el (pcomplete/ssh): SSH does allow ganging.
......
......@@ -513,34 +513,40 @@ This also saves the value of `send-mail-function' via Customize."
;; a second time, probably because someone's using an old value
;; of send-mail-function.
(when (eq send-mail-function 'sendmail-query-once)
(let* ((options `(("Mail client" . mailclient-send-it)
(let* ((options `(("mail client" . mailclient-send-it)
,@(when (and sendmail-program
(executable-find sendmail-program))
'(("Mail transport agent" . sendmail-send-it)))
("SMTP server" . smtpmail-send-it)))
'(("transport" . sendmail-send-it)))
("smtp" . smtpmail-send-it)))
(choice
;; Query the user.
(with-temp-buffer
(rename-buffer "*Emacs Mail Setup Help*" t)
(insert "\
Emacs is about to send an email message. However, it was not configured
for sending email. You can instruct Emacs to send email in one of the
following ways:
- Start your default mail client and pass to it the message text.
Type \"Mail client\" at the prompt below to select this option.\n\n")
(if (and sendmail-program
(executable-find sendmail-program))
(insert "\
- Invoke the system's mail transport agent (\"sendmail\").
Type \"Mail transport agent\" at the prompt below to select this option.\n\n"))
Emacs is about to send an email message, but it has not been
configured for sending email. To tell Emacs how to send email:
- Type `"
(propertize "mail client" 'face 'bold)
"' to start your default email client and
pass it the message text.\n\n")
(and sendmail-program
(executable-find sendmail-program)
(insert "\
- Type `"
(propertize "transport" 'face 'bold)
"' to invoke the system's mail transport agent
(the `"
sendmail-program
"' program).\n\n"))
(insert "\
- Send mail directly by communicating with your mail server
(this requires setting up SMTP parameters).
Type \"SMTP server\" at the prompt below to select this option.
- Type `"
(propertize "smtp" 'face 'bold)
"' to send mail directly to an \"outgoing mail\" server.
(Emacs may prompt you for SMTP settings).
Emacs will record your selection and will use it thereafter. To change
your selection later, customize the option `send-mail-function'.\n")
Emacs will record your selection and will use it thereafter.
To change it later, customize the option `send-mail-function'.\n")
(goto-char (point-min))
(display-buffer (current-buffer))
(let ((completion-ignore-case t))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment