[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106083: Improve wording in sendmail-
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106083: Improve wording in sendmail-query-once description of options. |
Date: |
Fri, 14 Oct 2011 15:49:32 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106083
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-10-14 15:49:32 +0200
message:
Improve wording in sendmail-query-once description of options.
lisp/mail/sendmail.el (sendmail-query-once): Improve the wording of
the explanation of the possible choices. Make the options passed
to completing-read shorter.
modified:
lisp/ChangeLog
lisp/mail/sendmail.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-13 18:37:57 +0000
+++ b/lisp/ChangeLog 2011-10-14 13:49:32 +0000
@@ -1,3 +1,9 @@
+2011-10-14 Eli Zaretskii <address@hidden>
+
+ * mail/sendmail.el (sendmail-query-once): Improve the wording of
+ the explanation of the possible choices. Make the options passed
+ to completing-read shorter.
+
2011-10-13 Agustín Martín Domingo <address@hidden>
* textmodes/flyspell.el (flyspell-large-region): Make sure
=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el 2011-10-11 21:31:22 +0000
+++ b/lisp/mail/sendmail.el 2011-10-14 13:49:32 +0000
@@ -513,21 +513,34 @@
;; 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 `(("My favorite mail client" . mailclient-send-it)
- ("Configuring Emacs's SMTP variables" . smtpmail-send-it)
+ (let* ((options `(("Mail client" . mailclient-send-it)
,@(when (and sendmail-program
(executable-find sendmail-program))
- '(("The system's mail transport agent"
- . sendmail-send-it)))))
+ '(("Mail transport agent" . sendmail-send-it)))
+ ("SMTP server" . smtpmail-send-it)))
(choice
;; Query the user.
(with-temp-buffer
- (rename-buffer "*Mail Help*" t)
- (insert "Emacs has not been set up for sending mail.\n
-It can be told to send mail either via your favorite mail client,
-or via the system's mail transport agent (\"sendmail\"), if any,
-or it can send email on its own by configuring the SMTP parameters.\n
-To change your decision later, customize `send-mail-function'.\n")
+ (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"))
+ (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.
+
+ Emacs will record your selection and will use it thereafter. To change
+ your selection later, customize the option `send-mail-function'.\n")
(goto-char (point-min))
(display-buffer (current-buffer))
(let ((completion-ignore-case t))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106083: Improve wording in sendmail-query-once description of options.,
Eli Zaretskii <=