@c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2012
-@c Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
+@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Sending Mail
@chapter Sending Mail
Subject: Re: What is best in life?
From: conan@@example.org
--text follows this line--
-To crush your enemies, see them driven before you, and to hear the
-lamentation of their women.
+To crush your enemies, see them driven before you, and to
+hear the lamentation of their women.
@end example
@noindent
@vindex user-full-name
@vindex user-mail-address
The @samp{From} header field identifies the person sending the email
-(i.e.@: you). This should be a valid mailing address, as replies are
+(i.e., you). This should be a valid mailing address, as replies are
normally sent there. The default contents of this header field are
computed from the variables @code{user-full-name} (which specifies
your full name) and @code{user-mail-address} (your email address). On
where @var{fulladdresses} can be either a single address, or multiple
addresses separated with spaces. For instance, to make @code{maingnu}
stand for @code{gnu@@gnu.org} plus a local address of your own, put in
-this line:@refill
+this line:
@example
alias maingnu gnu@@gnu.org local-gnu
sending mail via @code{smtpmail-send-it} (see below).
@item smtpmail-send-it
-Send mail using the through an external mail host, such as your
+Send mail through an external mail host, such as your
Internet service provider's outgoing SMTP mail server. If you have
not told Emacs how to contact the SMTP server, it prompts for this
information, which is saved in the @code{smtpmail-smtp-server} variable
@section Mail Signature
@cindex mail signature
-@vindex mail-signature-file
-@vindex mail-signature
+@vindex message-signature-file
+@vindex message-signature
You can add a standard piece of text---your @dfn{mail
signature}---to the end of every message. This signature may contain
information such as your telephone number or your physical location.
-The variable @code{mail-signature} determines how Emacs handles the
+The variable @code{message-signature} determines how Emacs handles the
mail signature.
- The default value of @code{mail-signature} is @code{t}; this means
-to look for your mail signature in the file @file{~/.signature}. If
-this file exists, its contents are automatically inserted into the end
-of the mail buffer. You can change the signature file via the
-variable @code{mail-signature-file}.
+ The default value of @code{message-signature} is @code{t}; this
+means to look for your mail signature in the file @file{~/.signature}.
+If this file exists, its contents are automatically inserted into the
+end of the mail buffer. You can change the signature file via the
+variable @code{message-signature-file}.
- If you change @code{mail-signature} to a string, that specifies the
-text of the signature directly.
+ If you change @code{message-signature} to a string, that specifies
+the text of the signature directly.
@kindex C-c C-w @r{(Message mode)}
@findex message-insert-signature
- If you change @code{mail-signature} to @code{nil}, Emacs will not
+ If you change @code{message-signature} to @code{nil}, Emacs will not
insert your mail signature automatically. You can insert your mail
signature by typing @kbd{C-c C-w} (@code{message-insert-signature}) in
the mail buffer. Emacs will look for your signature in the signature
file.
+@vindex mail-signature-file
+@vindex mail-signature
+ If you use Mail mode rather than Message mode for composing your
+mail, the corresponding variables that determine how your signature is
+sent are @code{mail-signature} and @code{mail-signature-file} instead.
+
By convention, a mail signature should be marked by a line whose
contents are @samp{-- }. If your signature lacks this prefix, it is
added for you. The remainder of your signature should be no more than