summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2003-07-04 11:24:57 +0000
committerGlenn Morris <rgm@gnu.org>2003-07-04 11:24:57 +0000
commit01bb608efbf382dbae963fc8706a036e2619abee (patch)
tree6d2c06813a687b1ba82a2dbd173bf438d056bf3b /lisp/mail
parentde41ff5ed9653cca2f9011e2f5f80de23a263e6c (diff)
downloademacs-01bb608efbf382dbae963fc8706a036e2619abee.tar.gz
(mail-specify-envelope-from, mail-envelope-from): Doc fix.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/sendmail.el12
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 130bd160a4b..fa6fd8952ff 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -70,16 +70,20 @@ controlled by a separate variable, `mail-specify-envelope-from'."
The value used to specify it is whatever is found in
`mail-envelope-from', with `user-mail-address' as fallback.
-On most systems, specifying the envelope-from address
-is a privileged operation."
+On most systems, specifying the envelope-from address is a
+privileged operation. This variable is only used if
+`send-mail-function' is set to `sendmail-send-it'."
:version "21.1"
:type 'boolean
:group 'sendmail)
(defcustom mail-envelope-from nil
"*If non-nil, designate the envelope-from address when sending mail.
-If this is nil while `mail-specify-envelope-from' is non-nil, the
-content of `user-mail-address' is used."
+This only has an effect if `mail-specify-envelope-from' is non-nil.
+The value should be either a string, or the symbol `header' (in
+which case the contents of the \"From\" header of the message
+being sent is used), or nil (in which case the value of
+`user-mail-address' is used)."
:version "21.1"
:type '(choice (string :tag "From-name")
(const :tag "Use From: header from message" header)