X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2d809ffafd3e1bde360c08f3be4b7d9a43ff5f0e..7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08:/doc/emacs/sending.texi diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 1402d8a85b..30b8491e27 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2013 Free Software +@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2016 Free Software @c Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail @@ -136,7 +136,7 @@ Use both address and full name, as in:@* Use both address and full name, as in:@* @samp{Elvis Parsley }. @item any other value -Use @code{angles} normally. But if the address must be ``quoted'' to +Use @code{angles} normally. But if the address must be quoted to remain syntactically valid under the @code{angles} format but not under the @code{parens} format, use @code{parens} instead. This is the default. @@ -159,7 +159,7 @@ directed at them. @item BCC Additional mailing address(es) to send the message to, which should -not appear in the header of the message actually sent. ``BCC'' stands +not appear in the header of the message actually sent. @samp{BCC} stands for @dfn{blind carbon copies}. @item FCC @@ -256,7 +256,7 @@ This means that @var{nick} should expand into @var{fulladdresses}, 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 @@ -276,7 +276,7 @@ of the address, such as the person's full name. Emacs puts them in if they are needed. For instance, it inserts the above address as @samp{"John Q. Smith" }. - Emacs also recognizes ``include'' commands in @file{.mailrc}. They + Emacs also recognizes include commands in @file{.mailrc}. They look like this: @example @@ -341,7 +341,7 @@ Send the message, and leave the mail buffer selected (@code{message-send}). @vindex message-kill-buffer-on-exit The usual command to send a message is @kbd{C-c C-c} (@code{mail-send-and-exit}). This sends the message and then -``buries'' the mail buffer, putting it at the lowest priority for +buries the mail buffer, putting it at the lowest priority for reselection. If you want it to kill the mail buffer instead, change the variable @code{message-kill-buffer-on-exit} to @code{t}. @@ -568,8 +568,8 @@ was yanked, but it checks the text that you yourself inserted (it looks for indentation or @code{mail-yank-prefix} to distinguish the cited lines from your input). @xref{Spelling}. -@vindex mail-mode-hook -@vindex mail-setup-hook +@vindex message-mode-hook +@vindex message-setup-hook Turning on Message mode (which @kbd{C-x m} does automatically) runs the normal hooks @code{text-mode-hook} and @code{message-mode-hook}. Initializing a new outgoing message runs the normal hook @@ -592,31 +592,37 @@ are inserted. @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 @@ -642,7 +648,7 @@ it all. Whether or not this is true, it at least amuses some people. @findex fortune-to-signature @cindex fortune cookies - You can use the @code{fortune} program to put a ``fortune cookie'' + You can use the @code{fortune} program to put a fortune cookie message into outgoing mail. To do this, add @code{fortune-to-signature} to @code{mail-setup-hook}: