commit 4010631fe915503e5376458d8a8b482d37360f87 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sun May 20 21:27:42 2018 +0300 Revert part of the previous change * doc/misc/message.texi: * doc/misc/efaq.texi: * doc/emacs/sending.texi: * doc/emacs/rmail.texi: Revert the CC => Cc etc. conversions. diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 5bf96dbe4e..1366535837 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -753,24 +753,24 @@ Try sending a bounced message a second time (@code{rmail-retry-failure}). to the message you are reading. To do this, type @kbd{r} (@code{rmail-reply}). This displays a mail composition buffer in another window, much like @kbd{C-x 4 m}, but preinitializes the -@samp{Subject}, @samp{To}, @samp{Cc}, @samp{In-Reply-To} and +@samp{Subject}, @samp{To}, @samp{CC}, @samp{In-Reply-To} and @samp{References} header fields based on the message you are replying to. The @samp{To} field starts out as the address of the person who -sent the message you received, and the @samp{Cc} field starts out with +sent the message you received, and the @samp{CC} field starts out with all the other recipients of that message. @vindex mail-dont-reply-to-names You can exclude certain recipients from being included automatically in replies, using the variable @code{mail-dont-reply-to-names}. Its value should be a regular expression; any recipients that match are -excluded from the @samp{Cc} field. They are also excluded from the +excluded from the @samp{CC} field. They are also excluded from the @samp{To} field, unless this would leave the field empty. If this variable is @code{nil}, then the first time you compose a reply it is initialized to a default value that matches your own address. To reply only to the sender of the original message, enter the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}. -This omits the @samp{Cc} field completely for a particular reply. +This omits the @samp{CC} field completely for a particular reply. Once the mail composition buffer has been initialized, editing and sending the mail goes as usual (@pxref{Sending Mail}). You can edit @@ -939,8 +939,8 @@ commas. @kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients}) makes a partial summary mentioning only the messages that have one or more recipients matching the regular expression @var{rcpts}. This is matched -against the @samp{To}, @samp{From}, and @samp{Cc} headers (supply a prefix -argument to exclude the @samp{Cc} header). +against the @samp{To}, @samp{From}, and @samp{CC} headers (supply a prefix +argument to exclude the @samp{CC} header). @kindex C-M-t @r{(Rmail)} @findex rmail-summary-by-topic diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 720f747436..00b3c4d753 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -70,7 +70,7 @@ or using some other method. @xref{Mail Sending}, for details. @example To: subotai@@example.org -Cc: mongol.soldier@@example.net, rms@@gnu.org +CC: mongol.soldier@@example.net, rms@@gnu.org Subject: Re: What is best in life? From: conan@@example.org --text follows this line-- @@ -82,7 +82,7 @@ hear the lamentation of their women. At the top of the mail buffer is a set of @dfn{header fields}, which are used for specifying information about the email's recipient(s), subject, and so on. The above buffer contains header fields for -@samp{To}, @samp{Cc}, @samp{Subject}, and @samp{From}. Some header +@samp{To}, @samp{CC}, @samp{Subject}, and @samp{From}. Some header fields are automatically pre-initialized in the mail buffer, when appropriate. @@ -152,23 +152,23 @@ more than one address, use commas to separate them. @item Subject The subject of the message. -@item Cc +@item CC Additional mailing address(es) to send the message to. This is like @samp{To}, except that these readers should not regard the message as directed at them. -@item Bcc +@item BCC Additional mailing address(es) to send the message to, which should -not appear in the header of the message actually sent. @samp{Bcc} stands +not appear in the header of the message actually sent. @samp{BCC} stands for @dfn{blind carbon copies}. -@item Fcc +@item FCC The name of a file, to which a copy of the sent message should be appended. Emacs writes the message in mbox format, unless the file is in Babyl format (used by Rmail before Emacs 23), in which case Emacs writes in Babyl format. If an Rmail buffer is visiting the file, Emacs updates it accordingly. To specify more than one file, use -several @samp{Fcc} fields, with one file name in each field. +several @samp{FCC} fields, with one file name in each field. @item Reply-To An address to which replies should be sent, instead of @samp{From}. @@ -198,7 +198,7 @@ this is normally filled in automatically for you. @end table @noindent -The @samp{To}, @samp{Cc}, and @samp{Bcc} fields can appear any number +The @samp{To}, @samp{CC}, and @samp{BCC} fields can appear any number of times, and each such header field can contain multiple addresses, separated by commas. This way, you can specify any number of places to send the message. These fields can also have continuation lines: @@ -221,11 +221,11 @@ To: foo@@example.net, this@@example.net, buffer by setting the variable @code{mail-default-headers} to a string. Then @kbd{C-x m} inserts this string into the message headers. For example, here is how to add a @samp{Reply-To} and -@samp{Fcc} header to each message: +@samp{FCC} header to each message: @smallexample (setq mail-default-headers - "Reply-To: foo@@example.com\nFcc: ~/Mail/sent") + "Reply-To: foo@@example.com\nFCC: ~/Mail/sent") @end smallexample @noindent @@ -293,7 +293,7 @@ alias definitions and include commands. Mail aliases expand as abbrevs---that is to say, as soon as you type a word-separator character after an alias (@pxref{Abbrevs}). This expansion takes place only within the @samp{To}, @samp{From}, -@samp{Cc}, @samp{Bcc}, and @samp{Reply-To} header fields (plus their +@samp{CC}, @samp{BCC}, and @samp{Reply-To} header fields (plus their @samp{Resent-} variants); it does not take place in other header fields, such as @samp{Subject}. @@ -418,16 +418,16 @@ Move to the @samp{To} header (@code{message-goto-to}). @item C-c C-f C-s Move to the @samp{Subject} header (@code{message-goto-subject}). @item C-c C-f C-c -Move to the @samp{Cc} header (@code{message-goto-cc}). +Move to the @samp{CC} header (@code{message-goto-cc}). @item C-c C-f C-b -Move to the @samp{Bcc} header (@code{message-goto-bcc}). +Move to the @samp{BCC} header (@code{message-goto-bcc}). @item C-c C-f C-r Move to the @samp{Reply-To} header (@code{message-goto-reply-to}). @item C-c C-f C-f Move to the @samp{Mail-Followup-To} header field (@code{message-goto-followup-to}). @item C-c C-f C-w -Add a new @samp{Fcc} header field, with file-name completion +Add a new @samp{FCC} header field, with file-name completion (@code{message-goto-fcc}). @item C-c C-b Move to the start of the message body (@code{message-goto-body}). @@ -463,7 +463,7 @@ the body. @findex message-tab @kindex TAB @r{(Message mode)} While editing a header field that contains addresses, such as -@samp{To:}, @samp{Cc:} and @samp{Bcc:}, you can complete an address by +@samp{To:}, @samp{CC:} and @samp{BCC:}, you can complete an address by typing @key{TAB} (@code{message-tab}). This attempts to insert the full name corresponding to the address based on a couple of methods, including EUDC, a library that recognizes a number of directory server diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 0649ed504d..862d283180 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -4463,11 +4463,11 @@ appropriate regexp. @cindex Automatic filing of outgoing mail @cindex Mail, saving outgoing automatically -You can either mail yourself a copy by including a @samp{Bcc} header in the +You can either mail yourself a copy by including a @samp{BCC} header in the mail message, or store a copy of the message directly to a file by -including an @samp{Fcc} header. +including an @samp{FCC} header. -If you use standard mail, you can automatically create a @samp{Bcc} to +If you use standard mail, you can automatically create a @samp{BCC} to yourself by putting @lisp @@ -4475,7 +4475,7 @@ yourself by putting @end lisp @noindent -in your @file{.emacs} file. You can automatically include an @samp{Fcc} +in your @file{.emacs} file. You can automatically include an @samp{FCC} field by putting something like the following in your @file{.emacs} file: @@ -4485,7 +4485,7 @@ file: The output file will be in Unix mail format. -If you use @code{mh-e}, add an @samp{Fcc} or @samp{Bcc} field to your +If you use @code{mh-e}, add an @samp{FCC} or @samp{BCC} field to your components file. It does not work to put @samp{set record filename} in the @file{.mailrc} @@ -4563,7 +4563,7 @@ these systems, you should configure @code{movemail} to use @code{flock}. @c isaacson@@seas.upenn.edu Ron Isaacson says: When you hit @kbd{r} to reply in Rmail, by default it Ccs all of the original -recipients (everyone on the original @samp{To} and @samp{Cc} +recipients (everyone on the original @samp{To} and @samp{CC} lists). With a prefix argument (i.e., typing @kbd{C-u} before @kbd{r}), it replies only to the sender. However, going through the whole @kbd{C-u} business every time you want to reply is a pain. This is the diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 3d342f5ebb..61eca759f4 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -162,7 +162,7 @@ header should be. If it does not, it should just return @code{nil}, and the normal methods for determining the To header will be used. Each list element should be a cons, where the @sc{car} should be the -name of a header (e.g., @code{Cc}) and the @sc{cdr} should be the header +name of a header (e.g., @code{CC}) and the @sc{cdr} should be the header value (e.g., @samp{larsi@@ifi.uio.no}). All these headers will be inserted into the head of the outgoing mail. @@ -174,7 +174,7 @@ inserted into the head of the outgoing mail. The @code{message-wide-reply} pops up a message buffer that's a wide reply to the message in the current buffer. A @dfn{wide reply} is a reply that goes out to all people listed in the @code{To}, @code{From} -(or @code{Reply-To}) and @code{Cc} headers. +(or @code{Reply-To}) and @code{CC} headers. @vindex message-wide-reply-to-function Message uses the normal methods to determine where wide replies are to go, @@ -185,7 +185,7 @@ but you can change the behavior to suit your needs by fiddling with the @vindex message-dont-reply-to-names Addresses that match the @code{message-dont-reply-to-names} regular expression (or list of regular expressions or a predicate function) -will be removed from the @code{Cc} header. A value of @code{nil} means +will be removed from the @code{CC} header. A value of @code{nil} means to exclude only your email address. @vindex message-prune-recipient-rules @@ -199,7 +199,7 @@ to match addresses to be pruned. It's complicated to explain, but it's easy to use. For instance, if you get an email from @samp{foo@@example.org}, but -@samp{foo@@zot.example.org} is also in the @code{Cc} list, then your +@samp{foo@@zot.example.org} is also in the @code{CC} list, then your wide reply will go out to both these addresses, since they are unique. To avoid this, do something like the following: @@ -487,10 +487,10 @@ MFT field. If there is one, it is left alone. (Except if it's empty; in that case, the field is removed and is not replaced with an automatically generated one. This lets you disable MFT generation on a per-message basis.) If there is none, then the list of recipient -addresses (in the To: and Cc: headers) is checked to see if one of them +addresses (in the To: and CC: headers) is checked to see if one of them is a list address you are subscribed to. If none of them is a list address, then no MFT is generated; otherwise, a MFT is added to the -other headers and set to the value of all addresses in To: and Cc: +other headers and set to the value of all addresses in To: and CC: @kindex C-c C-f C-a @findex message-generate-unsubscribed-mail-followup-to @@ -516,7 +516,7 @@ header, Gnus' action will depend on the value of the variable @table @code @item use - Always honor MFTs. The To: and Cc: headers in your followup will be + Always honor MFTs. The To: and CC: headers in your followup will be derived from the MFT header of the original post. This is the default. @item nil @@ -593,17 +593,17 @@ in the key binding is for Originator.) @item C-c C-f C-b @kindex C-c C-f C-b @findex message-goto-bcc -Go to the @code{Bcc} header (@code{message-goto-bcc}). +Go to the @code{BCC} header (@code{message-goto-bcc}). @item C-c C-f C-w @kindex C-c C-f C-w @findex message-goto-fcc -Go to the @code{Fcc} header (@code{message-goto-fcc}). +Go to the @code{FCC} header (@code{message-goto-fcc}). @item C-c C-f C-c @kindex C-c C-f C-c @findex message-goto-cc -Go to the @code{Cc} header (@code{message-goto-cc}). +Go to the @code{CC} header (@code{message-goto-cc}). @item C-c C-f C-s @kindex C-c C-f C-s @@ -662,7 +662,7 @@ fetches the contents of the @samp{To:} header in the current mail buffer, and appends the current @code{user-mail-address}. If the optional argument @code{include-cc} is non-@code{nil}, the -addresses in the @samp{Cc:} header are also put into the +addresses in the @samp{CC:} header are also put into the @samp{Mail-Followup-To:} header. @end table @@ -696,7 +696,7 @@ or @code{Newsgroups} header of the article you're replying to @kindex C-c C-l @findex message-to-list-only Send a message to the list only. Remove all addresses but the list -address from @code{To:} and @code{Cc:} headers. +address from @code{To:} and @code{CC:} headers. @item C-c M-n @kindex C-c M-n @@ -746,13 +746,13 @@ by the @code{message-cross-post-note-function} variable. @item C-c C-f t @kindex C-c C-f t @findex message-reduce-to-to-cc -Replace contents of @samp{To} header with contents of @samp{Cc} -header (or the @samp{Bcc} header, if there is no @samp{Cc} header). +Replace contents of @samp{To} header with contents of @samp{CC} +header (or the @samp{BCC} header, if there is no @samp{CC} header). @item C-c C-f w @kindex C-c C-f w @findex message-insert-wide-reply -Insert @samp{To} and @samp{Cc} headers as if you were doing a wide +Insert @samp{To} and @samp{CC} headers as if you were doing a wide reply even if the message was not made for a wide reply first. @item C-c C-f a @@ -902,7 +902,7 @@ found in RFC 3490. Message is a @acronym{IDNA}-compliant posting agent. The user generally doesn't have to do anything to make the @acronym{IDNA} happen---Message will encode non-@acronym{ASCII} domain names in @code{From}, -@code{To}, and @code{Cc} headers automatically. +@code{To}, and @code{CC} headers automatically. Until @acronym{IDNA} becomes more well known, Message queries you whether @acronym{IDNA} encoding of the domain name really should @@ -1011,7 +1011,7 @@ and/or encrypted messages as explained in the following. * Passphrase caching:: How to cache passphrases * PGP Compatibility:: Compatibility with older implementations * Encrypt-to-self:: Reading your own encrypted messages -* Bcc Warning:: Do not use encryption with Bcc headers +* BCC Warning:: Do not use encryption with BCC headers @end menu @node Signing and encryption @@ -1300,7 +1300,7 @@ information about the problem.) @subsection Encrypt-to-self By default, messages are encrypted to all recipients (@code{To}, -@code{Cc}, @code{Bcc} headers). Thus, you will not be able to decrypt +@code{CC}, @code{BCC} headers). Thus, you will not be able to decrypt your own messages. To make sure that messages are also encrypted to your own key(s), several alternative solutions exist: @enumerate @@ -1318,17 +1318,17 @@ OpenPGP) or @code{mml-secure-smime-encrypt-to-self} (for @acronym{S/MIME} with EasyPG). @end enumerate -@node Bcc Warning -@subsection Bcc Warning +@node BCC Warning +@subsection BCC Warning -The @code{Bcc} header is meant to hide recipients of messages. +The @code{BCC} header is meant to hide recipients of messages. However, when encrypted messages are used, the e-mail addresses of all -@code{Bcc}-headers are given away to all recipients without +@code{BCC}-headers are given away to all recipients without warning, which is a bug. @vindex mml-secure-safe-bcc-list -But now Message got to warn if @code{Bcc} recipients are found in an +But now Message got to warn if @code{BCC} recipients are found in an encrypted message when you are just about to send it. If you are sure -those @code{Bcc} addresses are safe to expose, set the +those @code{BCC} addresses are safe to expose, set the @code{mml-secure-safe-bcc-list} variable, that is a list of e-mail addresses. See @uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718}. @@ -1468,16 +1468,16 @@ alias ding "ding@@ifi.uio.no (ding mailing list)" @end example After adding lines like this to your @file{~/.mailrc} file, you should -be able to just write @samp{lmi} in the @code{To} or @code{Cc} (and so +be able to just write @samp{lmi} in the @code{To} or @code{CC} (and so on) headers and press @kbd{SPC} to expand the alias. No expansion will be performed upon sending of the message---all expansions have to be done explicitly. If you're using @code{ecomplete}, all addresses from @code{To} and -@code{Cc} headers will automatically be put into the +@code{CC} headers will automatically be put into the @file{~/.ecompleterc} file. When you enter text in the @code{To} and -@code{Cc} headers, @code{ecomplete} will check out the values stored +@code{CC} headers, @code{ecomplete} will check out the values stored there and ``electrically'' say what completions are possible. To choose one of these completions, use the @kbd{M-n} command to move down to the list. Use @kbd{@key{DOWN}} or @kbd{M-n} and @@ -1681,7 +1681,7 @@ trailing old subject. In this case, @item message-alternative-emails @vindex message-alternative-emails Regexp or predicate function matching alternative email addresses. -The first address in the To, Cc or From headers of the original +The first address in the To, CC or From headers of the original article matching this variable is used as the From field of outgoing messages, replacing the default From value. @@ -1701,7 +1701,7 @@ off @code{message-setup-hook}. @item message-allow-no-recipients @vindex message-allow-no-recipients Specifies what to do when there are no recipients other than -@code{Gcc} or @code{Fcc}. If it is @code{always}, the posting is +@code{Gcc} or @code{FCC}. If it is @code{always}, the posting is allowed. If it is @code{never}, the posting is not allowed. If it is @code{ask} (the default), you are prompted. @@ -1713,7 +1713,7 @@ hidden when composing a message. @lisp (setq message-hidden-headers - '(not "From" "Subject" "To" "Cc" "Newsgroups")) + '(not "From" "Subject" "To" "CC" "Newsgroups")) @end lisp Headers are hidden using narrowing, you can use @kbd{M-x widen} to @@ -1722,9 +1722,9 @@ expose them in the buffer. @item message-header-synonyms @vindex message-header-synonyms A list of lists of header synonyms. E.g., if this list contains a -member list with elements @code{Cc} and @code{To}, then +member list with elements @code{CC} and @code{To}, then @code{message-carefully-insert-headers} will not insert a @code{To} -header when the message is already @code{Cc}ed to the recipient. +header when the message is already @code{CC}ed to the recipient. @end table @@ -1742,7 +1742,7 @@ header when the message is already @code{Cc}ed to the recipient. @item message-ignored-mail-headers @vindex message-ignored-mail-headers Regexp of headers to be removed before mailing. The default is@* -@samp{^[GF]cc:\\|^Resent-Fcc:\\|^Xref:\\|^X-Draft-From:\\|@* +@samp{^[GF]cc:\\|^Resent-FCC:\\|^Xref:\\|^X-Draft-From:\\|@* ^X-Gnus-Agent-Meta-Information:}. @item message-default-mail-headers @@ -2091,7 +2091,7 @@ for which the check is disabled by default if @item message-ignored-news-headers @vindex message-ignored-news-headers Regexp of headers to be removed before posting. The default is@* -@samp{^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|@* +@samp{^NNTP-Posting-Host:\\|^Xref:\\|^[BGF]cc:\\|^Resent-FCC:\\|@* ^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:}. @item message-default-news-headers @@ -2471,7 +2471,7 @@ an article\\nthat has been posted to %s as well.\\n\\n"}. @item message-fcc-externalize-attachments @vindex message-fcc-externalize-attachments -If @code{nil}, attach files as normal parts in Fcc copies; if it is +If @code{nil}, attach files as normal parts in FCC copies; if it is non-@code{nil}, attach local files as external parts. @item message-interactive @@ -2626,13 +2626,13 @@ consulted, in turn: A @dfn{wide reply} is a mail response that includes @emph{all} entities mentioned in the message you are responding to. All mailboxes from the following headers will be concatenated to form the outgoing -@code{To}/@code{Cc} headers: +@code{To}/@code{CC} headers: @table @code @item From (unless there's a @code{Reply-To}, in which case that is used instead). -@item Cc +@item CC @item To @end table @@ -2656,7 +2656,7 @@ sent: @end table If a @code{Mail-Copies-To} header is present, it will be used as the -basis of the new @code{Cc} header, except if this header is +basis of the new @code{CC} header, except if this header is @samp{never}. @end table commit ee2916c6d25f963649c9fe2583faf66538f60180 Author: Paul Eggert Date: Sun May 20 10:47:32 2018 -0700 Use “Cc” for email copies, as per RFC 5322. Also fix similar problems with Bcc, Fcc, In-Reply-To, and similar email headers. See thread starting at: https://lists.gnu.org/r/emacs-devel/2018-05/msg00463.html diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index c39458184f..f3bc304554 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -8,7 +8,7 @@ This is 95% of all you will ever need to know. ** How do I report a bug? Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org. -If you want to Cc someone, use an "X-Debbugs-CC" header (or +If you want to Cc someone, use an "X-Debbugs-Cc" header (or pseudo-header, see below) instead. ** How do I comment on a bug? @@ -53,7 +53,7 @@ i) Your report will be assigned a number and generate an automatic reply. ii) Optionally, you can set some database parameters when you first report a bug (see "Setting bug parameters" below). -iii) If you want to CC: someone, use X-Debbugs-CC: (note this only +iii) If you want to Cc someone, use X-Debbugs-Cc: (note this only applies to _new_ reports, not followups). Once your report is filed and assigned a number, it is sent out to the @@ -64,8 +64,8 @@ quiet@debbugs.gnu.org. ** How do I reply to an existing bug report? Reply to 123@debbugs.gnu.org, replacing 123 with the number of the bug you are interested in. NB this only sends mail to the -bug-list, it does NOT send a CC to the original bug submitter. -So you need to explicitly CC him/her (and anyone else you like). +bug-list, it does NOT send a Cc to the original bug submitter. +So you need to explicitly Cc him/her (and anyone else you like). (This works the same way as all the Emacs mailing lists. We generally don't assume anyone who posts to a list is subscribed to it, so we cc everyone on replies.) @@ -95,23 +95,23 @@ normal bug reporting.) ** When reporting a new bug, to send a Cc to another address (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header. -Instead, use "X-Debbugs-CC:". This ensures the Cc address(es) will get a +Instead, use "X-Debbugs-Cc:". This ensures the Cc address(es) will get a mail with the bug report number in. If you do not do this, each reply in the subsequent discussion might end up creating a new bug. This is annoying. (So annoying that a form of message-id tracking has been implemented to hopefully stop this happening, but it is still -better to use X-Debbugs-CC.) +better to use X-Debbugs-Cc.) If you want to send copies to more than one address, add them -comma-separated in only one X-Debbugs-CC line. +comma-separated in only one X-Debbugs-Cc line. Like any X-Debbugs- header, this one can also be specified in the pseudo-header (see below), if your mail client does not let you add "X-" headers. -If a new report contains X-Debbugs-CC in the input, this is +If a new report contains X-Debbugs-Cc in the input, this is converted to a real Cc header in the output. (See Bug#1780,5384) -It is also merged into the Resent-CC header (see below). +It is also merged into the Resent-Cc header (see below). ** How does Debbugs send out mails? @@ -120,15 +120,15 @@ header is unchanged. In new reports only (at present), the To: address is altered as follows. Any "bug-gnu-emacs", "emacs-pretest-bug", or "submit@debbugs" address is replaced by 123@debbugs in the mail that gets sent out. (This also applies to any -Cc: header, though you should be using X-Debbugs-CC instead in new +Cc: header, though you should be using X-Debbugs-Cc instead in new reports). The original header is stored as X-Debbugs-Original-To, if -it was changed. Any X-Debbugs-CC is merged into the Cc. +it was changed. Any X-Debbugs-Cc is merged into the Cc. Mails arriving at the bug list have the following Resent-* headers: Resent-From: person who submitted the bug Resent-To: owner@debbugs.gnu.org -Resent-CC: maintainer email address, plus any X-Debbugs-CC: entries +Resent-Cc: maintainer email address, plus any X-Debbugs-Cc: entries The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. @@ -239,7 +239,7 @@ The control server ignores anything after the last line above. So you can place control commands at the beginning of a reply to a bug report, and Bcc: the control server (note the commands have no effect if you just send them to the bug-report number). Bcc: is better than Cc: -in case people use Reply-to-All in response. +in case people use Reply-To-All in response. Some useful control commands: diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1 index ab9da47513..26a0d3e9f9 100644 --- a/doc/emacs/ChangeLog.1 +++ b/doc/emacs/ChangeLog.1 @@ -4398,7 +4398,7 @@ mail-header-separator. (Mail Headers): Put info about initialization and changing in one place at the start. Update FCC section for mbox Rmail. Clarify From - section, mention mail-setup-with-from. Clarify Reply-to section. + section, mention mail-setup-with-from. Clarify Reply-To section. Add Mail-followup-to and mail-mailing-lists. Clarify References section. (Mail Aliases): Update example, make less contentious. diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 0a8bf7cc26..5bf96dbe4e 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -753,24 +753,24 @@ Try sending a bounced message a second time (@code{rmail-retry-failure}). to the message you are reading. To do this, type @kbd{r} (@code{rmail-reply}). This displays a mail composition buffer in another window, much like @kbd{C-x 4 m}, but preinitializes the -@samp{Subject}, @samp{To}, @samp{CC}, @samp{In-reply-to} and +@samp{Subject}, @samp{To}, @samp{Cc}, @samp{In-Reply-To} and @samp{References} header fields based on the message you are replying to. The @samp{To} field starts out as the address of the person who -sent the message you received, and the @samp{CC} field starts out with +sent the message you received, and the @samp{Cc} field starts out with all the other recipients of that message. @vindex mail-dont-reply-to-names You can exclude certain recipients from being included automatically in replies, using the variable @code{mail-dont-reply-to-names}. Its value should be a regular expression; any recipients that match are -excluded from the @samp{CC} field. They are also excluded from the +excluded from the @samp{Cc} field. They are also excluded from the @samp{To} field, unless this would leave the field empty. If this variable is @code{nil}, then the first time you compose a reply it is initialized to a default value that matches your own address. To reply only to the sender of the original message, enter the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}. -This omits the @samp{CC} field completely for a particular reply. +This omits the @samp{Cc} field completely for a particular reply. Once the mail composition buffer has been initialized, editing and sending the mail goes as usual (@pxref{Sending Mail}). You can edit @@ -939,8 +939,8 @@ commas. @kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients}) makes a partial summary mentioning only the messages that have one or more recipients matching the regular expression @var{rcpts}. This is matched -against the @samp{To}, @samp{From}, and @samp{CC} headers (supply a prefix -argument to exclude the @samp{CC} header). +against the @samp{To}, @samp{From}, and @samp{Cc} headers (supply a prefix +argument to exclude the @samp{Cc} header). @kindex C-M-t @r{(Rmail)} @findex rmail-summary-by-topic diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index b7bdd69c7c..720f747436 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -170,14 +170,14 @@ writes in Babyl format. If an Rmail buffer is visiting the file, Emacs updates it accordingly. To specify more than one file, use several @samp{Fcc} fields, with one file name in each field. -@item Reply-to +@item Reply-To An address to which replies should be sent, instead of @samp{From}. This is used if, for some reason, your @samp{From} address cannot receive replies. -@item Mail-reply-to -This field takes precedence over @samp{Reply-to}. It is used because -some mailing lists set the @samp{Reply-to} field for their own +@item Mail-Reply-To +This field takes precedence over @samp{Reply-To}. It is used because +some mailing lists set the @samp{Reply-To} field for their own purposes (a somewhat controversial practice). @item Mail-Followup-To @@ -186,14 +186,14 @@ messages. This is typically used when you reply to a message from a mailing list that you are subscribed to, and want replies to go to the list without sending an extra copy to you. -@item In-reply-to +@item In-Reply-To An identifier for the message you are replying to. Most mail readers use this information to group related messages together. Normally, this header is filled in automatically when you reply to a message in any mail program built into Emacs. @item References -Identifiers for previous related messages. Like @samp{In-reply-to}, +Identifiers for previous related messages. Like @samp{In-Reply-To}, this is normally filled in automatically for you. @end table @@ -220,12 +220,12 @@ To: foo@@example.net, this@@example.net, You can direct Emacs to insert certain default headers into the mail buffer by setting the variable @code{mail-default-headers} to a string. Then @kbd{C-x m} inserts this string into the message -headers. For example, here is how to add a @samp{Reply-to} and +headers. For example, here is how to add a @samp{Reply-To} and @samp{Fcc} header to each message: @smallexample (setq mail-default-headers - "Reply-to: foo@@example.com\nFcc: ~/Mail/sent") + "Reply-To: foo@@example.com\nFcc: ~/Mail/sent") @end smallexample @noindent @@ -293,7 +293,7 @@ alias definitions and include commands. Mail aliases expand as abbrevs---that is to say, as soon as you type a word-separator character after an alias (@pxref{Abbrevs}). This expansion takes place only within the @samp{To}, @samp{From}, -@samp{Cc}, @samp{Bcc}, and @samp{Reply-to} header fields (plus their +@samp{Cc}, @samp{Bcc}, and @samp{Reply-To} header fields (plus their @samp{Resent-} variants); it does not take place in other header fields, such as @samp{Subject}. @@ -422,7 +422,7 @@ Move to the @samp{Cc} header (@code{message-goto-cc}). @item C-c C-f C-b Move to the @samp{Bcc} header (@code{message-goto-bcc}). @item C-c C-f C-r -Move to the @samp{Reply-to} header (@code{message-goto-reply-to}). +Move to the @samp{Reply-To} header (@code{message-goto-reply-to}). @item C-c C-f C-f Move to the @samp{Mail-Followup-To} header field (@code{message-goto-followup-to}). diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 96ca465728..0649ed504d 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -4463,11 +4463,11 @@ appropriate regexp. @cindex Automatic filing of outgoing mail @cindex Mail, saving outgoing automatically -You can either mail yourself a copy by including a @samp{BCC} header in the +You can either mail yourself a copy by including a @samp{Bcc} header in the mail message, or store a copy of the message directly to a file by -including an @samp{FCC} header. +including an @samp{Fcc} header. -If you use standard mail, you can automatically create a @samp{BCC} to +If you use standard mail, you can automatically create a @samp{Bcc} to yourself by putting @lisp @@ -4475,7 +4475,7 @@ yourself by putting @end lisp @noindent -in your @file{.emacs} file. You can automatically include an @samp{FCC} +in your @file{.emacs} file. You can automatically include an @samp{Fcc} field by putting something like the following in your @file{.emacs} file: @@ -4485,7 +4485,7 @@ file: The output file will be in Unix mail format. -If you use @code{mh-e}, add an @samp{FCC} or @samp{BCC} field to your +If you use @code{mh-e}, add an @samp{Fcc} or @samp{Bcc} field to your components file. It does not work to put @samp{set record filename} in the @file{.mailrc} @@ -4562,8 +4562,8 @@ these systems, you should configure @code{movemail} to use @code{flock}. @c isaacson@@seas.upenn.edu Ron Isaacson says: When you hit -@kbd{r} to reply in Rmail, by default it CCs all of the original -recipients (everyone on the original @samp{To} and @samp{CC} +@kbd{r} to reply in Rmail, by default it Ccs all of the original +recipients (everyone on the original @samp{To} and @samp{Cc} lists). With a prefix argument (i.e., typing @kbd{C-u} before @kbd{r}), it replies only to the sender. However, going through the whole @kbd{C-u} business every time you want to reply is a pain. This is the diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 3925cceaa6..c30403d2b4 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -708,7 +708,7 @@ RFC822 date when the part was read (@code{Content-Disposition}). @item recipients Who to encrypt/sign the part to. This field is used to override any -auto-detection based on the To/CC headers. +auto-detection based on the To/Cc headers. @item sender Identity used to sign the part. This field is used to override the diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index efef01f697..2ae5a0a042 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1161,13 +1161,13 @@ from using them): @example (setq nnmail-split-methods '(("duplicates" "^Gnus-Warning:.*duplicate") - ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.invalid.*") - ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.invalid.*") - ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.invalid.*") - ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.invalid.*") - ("Hamster-src" "^\\(CC:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*") + ("XEmacs-NT" "^\\(To:\\|Cc:\\).*localpart@@xemacs.invalid.*") + ("Gnus-Tut" "^\\(To:\\|Cc:\\).*localpart@@socha.invalid.*") + ("tcsh" "^\\(To:\\|Cc:\\).*localpart@@mx.gw.invalid.*") + ("BAfH" "^\\(To:\\|Cc:\\).*localpart@@.*uni-muenchen.invalid.*") + ("Hamster-src" "^\\(Cc:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*") ("Tagesschau" "^From: tagesschau $") - ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*") + ("Replies" "^\\(Cc:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*") ("EK" "^From:.*\\(localpart@@privateprovider.invalid\\|localpart@@workplace.invalid\\).*") ("Spam" "^Content-Type:.*\\(ks_c_5601-1987\\|EUC-KR\\|big5\\|iso-2022-jp\\).*") ("Spam" "^Subject:.*\\(This really work\\|XINGA\\|ADV:\\|XXX\\|adult\\|sex\\).*") @@ -1177,10 +1177,10 @@ from using them): ("Spam" "^From:.*\\(verizon\.net\\|prontomail\.com\\|money\\|ConsumerDirect\\).*") ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.invalid$") ("Spam" "^Received: from link2buy.com") - ("Spam" "^CC: .*azzrael@@t-online.invalid") + ("Spam" "^Cc: .*azzrael@@t-online.invalid") ("Spam" "^X-Mailer-Version: 1.50 BETA") - ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") - ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") + ("Uni" "^\\(Cc:\\|To:\\).*localpart@@uni-koblenz.invalid.*") + ("Inbox" "^\\(Cc:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") ("Spam" ""))) @end example @noindent diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 0fdb28f0d7..6793ed2e9f 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -5592,7 +5592,7 @@ command uses the process/prefix convention. Mail a wide reply to the author of the current article (@code{gnus-summary-wide-reply}). A @dfn{wide reply} is a reply that goes out to all people listed in the @code{To}, @code{From} (or -@code{Reply-to}) and @code{Cc} headers. If @code{Mail-Followup-To} is +@code{Reply-To}) and @code{Cc} headers. If @code{Mail-Followup-To} is present, that's used instead. @item S W @@ -5616,7 +5616,7 @@ message to the mailing list, and include the original message Mail a very wide reply to the author of the current article (@code{gnus-summary-wide-reply}). A @dfn{very wide reply} is a reply that goes out to all people listed in the @code{To}, @code{From} (or -@code{Reply-to}) and @code{Cc} headers in all the process/prefixed +@code{Reply-To}) and @code{Cc} headers in all the process/prefixed articles. This command uses the process/prefix convention. @item S V diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 671a5214ae..3d342f5ebb 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -174,7 +174,7 @@ inserted into the head of the outgoing mail. The @code{message-wide-reply} pops up a message buffer that's a wide reply to the message in the current buffer. A @dfn{wide reply} is a reply that goes out to all people listed in the @code{To}, @code{From} -(or @code{Reply-to}) and @code{Cc} headers. +(or @code{Reply-To}) and @code{Cc} headers. @vindex message-wide-reply-to-function Message uses the normal methods to determine where wide replies are to go, @@ -2056,7 +2056,7 @@ Check whether the @code{Newsgroups} header exists and is not empty. @item quoting-style Check whether text follows last quoted portion. @item repeated-newsgroups -Check whether the @code{Newsgroups} and @code{Followup-to} headers +Check whether the @code{Newsgroups} and @code{Followup-To} headers contains repeated group names. @item reply-to Check whether the @code{Reply-To} header looks ok. @@ -2069,7 +2069,7 @@ Check for the existence of version and sendsys commands. @item shoot Check whether the domain part of the @code{Message-ID} header looks ok. @item shorten-followup-to -Check whether to add a @code{Followup-to} header to shorten the number +Check whether to add a @code{Followup-To} header to shorten the number of groups to post to. @item signature Check the length of the signature. @@ -2080,7 +2080,7 @@ Check whether the @code{Subject} header exists and is not empty. @item subject-cmsg Check the subject for commands. @item valid-newsgroups -Check whether the @code{Newsgroups} and @code{Followup-to} headers +Check whether the @code{Newsgroups} and @code{Followup-To} headers are valid syntactically. @end table diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 7ec9aec016..8545525747 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -847,9 +847,9 @@ sending the original message, like this: To: cc: Subject: Re: Test -In-reply-to: <31054.1142621351@@stop.mail-abuse.org> +In-Reply-To: <31054.1142621351@@stop.mail-abuse.org> References: <31054.1142621351@@stop.mail-abuse.org> -Comments: In-reply-to Bill Wohler +Comments: In-Reply-To Bill Wohler message dated "Fri, 17 Mar 2006 10:49:11 -0800." X-Mailer: MH-E 8.1; nmh 1.1; GNU Emacs 23.1 -------- diff --git a/etc/NEWS.18 b/etc/NEWS.18 index 153c2f7a0a..e2645b9401 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -201,10 +201,10 @@ is carried over to the expansion that replaces it. has the syntax of an ordinary punctuation character. As a result, \[...\] and such like are considered to balance each other. -* Mail-mode automatic Reply-to field. +* Mail-mode automatic Reply-To field. If the variable `mail-default-reply-to' is non-`nil', then each time -you start to compose a message, a Reply-to field is inserted with +you start to compose a message, a Reply-To field is inserted with its contents taken from the value of `mail-default-reply-to'. * Where is your .emacs file? diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 12432eacf7..efe0f0e7f7 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -438,7 +438,7 @@ The other accent characters, not needed for the chosen language, remain normal. ** Posting articles and sending mail now has M-TAB completion on various -header fields (Newsgroups, To, CC, ...). +header fields (Newsgroups, To, Cc, ...). Completion in the Newsgroups header depends on the list of groups known to your news reader. Completion in the Followup-To header @@ -2087,7 +2087,7 @@ arguments are ARGS. for mail-default-reply-to. ** When you send a message in Emacs, if you specify an Rmail file with -the FCC: header field, Emacs converts the message to Rmail format +the Fcc: header field, Emacs converts the message to Rmail format before writing it. Thus, the file never contains anything but Rmail format messages. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 31e640fa94..398148bf57 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -986,7 +986,7 @@ be prompted for confirmation **** can generate a MESSAGE-ID: line and a DATE: line; the date can be the time the message was written or the time it is being sent; this -can make FCC copies more closely resemble copies that recipients get +can make Fcc copies more closely resemble copies that recipients get **** you can specify an arbitrary function for actually transmitting the message; included in feedmail are interfaces for /bin/[r]mail, diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index 908ca967a1..574e5d2c2f 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -289,7 +289,7 @@ \section{Čtení a posílání pošty} \key{C-x m} nová zpráva \key{C-c C-c} pošli zprávu a přepni do jiného bufferu -\key{C-c C-f C-c} přesuň se na hlavičku `CC' a pokud neexistuje, tak ji +\key{C-c C-f C-c} přesuň se na hlavičku `Cc' a pokud neexistuje, tak ji vytvoř \section{Různé} diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index f74e2adcb3..a6226427f3 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -287,7 +287,7 @@ \section{Lecture et envoi de courrier} \key{C-x m} d\'ebute la composition d'un message \key{C-c C-c} envoie le message et bascule dans un autre tampon -\key{C-c C-f C-c} va \`a l'ent\^ete `CC', en cr\'ee un s'il n'existe pas +\key{C-c C-f C-c} va \`a l'ent\^ete `Cc', en cr\'ee un s'il n'existe pas \section{Divers} diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index c4dab28f00..b063708536 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -292,7 +292,7 @@ \section{Čítanie a posielanie pošty} \key{C-x m} nová správa \key{C-c C-c} pošli správu a prepni sa do iného bufferu -\key{C-c C-f C-c} presuň sa na hlavičku `CC', a ak neexistuje, tak ju +\key{C-c C-f C-c} presuň sa na hlavičku `Cc', a ak neexistuje, tak ju vytvor \section{Rôzne} diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 5dee445717..63fdde1abc 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -278,7 +278,7 @@ \section{Reading and Sending Mail} \key{C-x m} begin composing a message \key{C-c C-c} send the message and switch to another buffer -\key{C-c C-f C-c} move to the `CC' header field, creating one +\key{C-c C-f C-c} move to the `Cc' header field, creating one if there is none \section{Miscellaneous} diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 1b0ed4206b..a5a654ac27 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -1229,7 +1229,7 @@ 1987-05-13 Richard M. Stallman (rms@prep) * sendmail.el (mail-setup): New parameter mail-default-reply-to: - if non-nil, insert it as a Reply-to field. + if non-nil, insert it as a Reply-To field. * dired.el (dired-unflag): Doc fix. @@ -3924,7 +3924,7 @@ New key bindings for setting insert motion direction: C-c <, C-c >, C-c ^ and C-c . instead of M- chars. - * rmail.el (rmail-reply): When putting From into In-reply-to, + * rmail.el (rmail-reply): When putting From into In-Reply-To, stop at any newline. * mail-utils.el (mail-strip-quoted-names): diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 8bdb6baf88..0374e1ba77 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 @@ -3739,7 +3739,7 @@ 1994-01-10 Michael D. Ernst (mernst@monozygote) - * mailabbrev.el (mail-abbrev-mode-regexp): Add Reply-to. + * mailabbrev.el (mail-abbrev-mode-regexp): Add Reply-To. 1994-01-09 Roland McGrath (roland@churchy.gnu.ai.mit.edu) diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 566e9b7cd1..3a68421274 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -991,7 +991,7 @@ 1995-05-19 Kevin Rodgers (tiny change) * mailalias.el (expand-mail-aliases): Expand aliases in - From and Reply-to headers as well, plus the Resent- variants. + From and Reply-To headers as well, plus the Resent- variants. * sendmail.el (mail-mode): Clarify doc string. (mail-text): Ditto. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index f534b6e165..27cbe10a8a 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -21076,7 +21076,7 @@ 1996-12-17 Jonathan I. Kamens * rnewspost.el (news-mail-reply, news-reply): Include the message - ID in the In-reply-to line. + ID in the In-Reply-To line. 1996-12-16 Erik Naggum diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index f6120dc5c7..055f02fb1a 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -198,9 +198,9 @@ Possible values in this list are: `newsgroups' Newsgroup identical to Gnus group. `to-address' To identical to To-address. `to-list' To identical to To-list. - `cc-list' CC identical to To-list. - `followup-to' Followup-to identical to Newsgroups. - `reply-to' Reply-to identical to From. + `cc-list' Cc identical to To-list. + `followup-to' Followup-To identical to Newsgroups. + `reply-to' Reply-To identical to From. `date' Date less than four days old. `long-to' To and/or Cc longer than 1024 characters. `many-to' Multiple To and/or Cc." @@ -208,9 +208,9 @@ Possible values in this list are: (const :tag "Newsgroups identical to Gnus group." newsgroups) (const :tag "To identical to To-address." to-address) (const :tag "To identical to To-list." to-list) - (const :tag "CC identical to To-list." cc-list) - (const :tag "Followup-to identical to Newsgroups." followup-to) - (const :tag "Reply-to identical to From." reply-to) + (const :tag "Cc identical to To-list." cc-list) + (const :tag "Followup-To identical to Newsgroups." followup-to) + (const :tag "Reply-To identical to From." reply-to) (const :tag "Date less than four days old." date) (const :tag "To and/or Cc longer than 1024 characters." long-to) (const :tag "Multiple To and/or Cc headers." many-to)) @@ -1947,7 +1947,7 @@ always hide." (when (and cc to-list (ignore-errors (gnus-string-equal - ;; only one address in CC + ;; only one address in Cc (nth 1 (mail-extract-address-components cc)) to-list))) (gnus-article-hide-header "cc")))) diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el index 6505f90d3e..660bdf73cd 100644 --- a/lisp/gnus/gnus-msg.el +++ b/lisp/gnus/gnus-msg.el @@ -1038,7 +1038,7 @@ header line with the old Message-ID." (gnus-inews-yank-articles yank)))))) (defun gnus-msg-treat-broken-reply-to (&optional force) - "Remove the Reply-to header if broken-reply-to." + "Remove the Reply-To header if broken-reply-to." (when (or force (gnus-group-find-parameter gnus-newsgroup-name 'broken-reply-to)) @@ -1483,7 +1483,7 @@ See `gnus-summary-mail-forward' for ARG." (not (member group (message-tokenize-header followup-to ", "))))) (if followup-to - (gnus-message 1 "Followup-to restricted") + (gnus-message 1 "Followup-To restricted") (gnus-message 1 "Not a crossposted article")) (set-buffer gnus-summary-buffer) (gnus-summary-reply-with-original 1) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 867c3d271b..7cc4d61e30 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1252,13 +1252,13 @@ called and its result is inserted." ;; Ease the transition from mail-mode to message-mode. See bugs#4431, 5555. (concat (if (and (boundp 'mail-default-reply-to) (stringp mail-default-reply-to)) - (format "Reply-to: %s\n" mail-default-reply-to)) + (format "Reply-To: %s\n" mail-default-reply-to)) (if (and (boundp 'mail-self-blind) mail-self-blind) - (format "BCC: %s\n" user-mail-address)) + (format "Bcc: %s\n" user-mail-address)) (if (and (boundp 'mail-archive-file-name) (stringp mail-archive-file-name)) - (format "FCC: %s\n" mail-archive-file-name)) + (format "Fcc: %s\n" mail-archive-file-name)) mail-default-headers) "A string of header lines to be inserted in outgoing mails." :version "23.2" @@ -2597,7 +2597,7 @@ PGG manual, depending on the value of `mml2015-use'." 'message))))) (defun message-all-recipients () - "Return a list of all recipients in the message, looking at TO, CC and BCC. + "Return a list of all recipients in the message, looking at TO, Cc and Bcc. Each recipient is in the format of `mail-extract-address-components'." (mapcan (lambda (header) @@ -3563,7 +3563,7 @@ Note that this should not be used in newsgroups." (message-remove-header "Disposition-Notification-To")) (message-goto-eoh) (insert (format "Disposition-Notification-To: %s\n" - (or (message-field-value "Reply-to") + (or (message-field-value "Reply-To") (message-field-value "From") (message-make-from)))))) @@ -5439,7 +5439,7 @@ Otherwise, generate and save a value for `canlock-password' first." (concat "^" (regexp-quote mail-header-separator) "$") nil t) (replace-match "" t t )) - ;; Process FCC operations. + ;; Process Fcc operations. (while list (setq file (pop list)) (if (string-match "^[ \t]*|[ \t]*\\(.*\\)[ \t]*$" file) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index e0bd4590b1..6093aecd5c 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1396,7 +1396,7 @@ It shows the simple addresses and gets a confirmation. Use as: When this hook runs, the current buffer is already the appropriate buffer. It has already had all the header prepping from the standard package. The next step after running the hook will be to save the -message via FCC: processing. The hook might be interested in these: +message via Fcc: processing. The hook might be interested in these: \(1) `feedmail-prepped-text-buffer' contains the header and body of the message, ready to go; (2) `feedmail-address-list' contains a list of simplified recipients of addresses which are to be given to the @@ -1607,7 +1607,7 @@ Feeds the buffer to it." "Function which actually calls sendmail as a subprocess. Feeds the buffer to it. Probably has some flaws for Resent-* and other complicated cases. Takes addresses from message headers and -might disappoint you with BCC: handling. In case of odd results, consult +might disappoint you with Bcc: handling. In case of odd results, consult local gurus." (require 'sendmail) (feedmail-say-debug ">in-> feedmail-buffer-to-sendmail %s" addr-listoid) diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el index fc9f8ddab1..463cec0f53 100644 --- a/lisp/mail/mail-utils.el +++ b/lisp/mail/mail-utils.el @@ -41,7 +41,7 @@ often correct parser." If this is nil, it is set the first time you compose a reply, to a value which excludes your own email address. -Matching addresses are excluded from the CC field in replies, and +Matching addresses are excluded from the Cc field in replies, and also the To field, unless this would leave an empty To field." :type '(choice regexp (const :tag "Your Name" nil)) :group 'mail) diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el index 99c0671b9b..ba1688f411 100644 --- a/lisp/mail/mailabbrev.el +++ b/lisp/mail/mailabbrev.el @@ -25,7 +25,7 @@ ;;; Commentary: -;; This file ensures that, when the point is in a To:, CC:, BCC:, or From: +;; This file ensures that, when the point is in a To:, Cc:, Bcc:, or From: ;; field, word-abbrevs are defined for each of your mail aliases. These ;; aliases will be defined from your .mailrc file (or the file specified by ;; `mail-personal-alias-file') if it exists. Your mail aliases will @@ -414,7 +414,7 @@ with a space." ;;; Syntax tables and abbrev-expansion (defcustom mail-abbrev-mode-regexp - "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):" + "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):" "Regexp matching mail headers in which mail abbrevs should be expanded. This string will be handed to `looking-at' with point at the beginning of the current line; if it matches, abbrev mode will be turned on, otherwise @@ -477,7 +477,7 @@ of a mail alias. The value is set up, buffer-local, when first needed.") ;; Necessary for `message-read-from-minibuffer' to work. (window-minibuffer-p)) - ;; We are in a To: (or CC:, or whatever) header or a minibuffer, + ;; We are in a To: (or Cc:, or whatever) header or a minibuffer, ;; and should use word-abbrevs to expand mail aliases. (let ((local-abbrev-table mail-abbrevs)) diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 424ae675b1..17b4cdfa4b 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -50,14 +50,14 @@ When t this still needs to be initialized.") (defvar mail-address-field-regexp - "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):") + "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):") (defvar pattern) (defcustom mail-complete-alist ;; Don't refer to mail-address-field-regexp here; ;; that confuses some things such as cus-dep.el. - '(("^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):" + '(("^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):" . (mail-get-names pattern)) ("Newsgroups:" . (if (boundp 'gnus-active-hashtb) gnus-active-hashtb @@ -169,7 +169,7 @@ When t this still needs to be initialized.") (defun expand-mail-aliases (beg end &optional exclude) "Expand all mail aliases in suitable header fields found between BEG and END. If interactive, expand in header fields. -Suitable header fields are `To', `From', `CC' and `BCC', `Reply-to', and +Suitable header fields are `To', `From', `Cc' and `Bcc', `Reply-To', and their `Resent-' variants. Optional second arg EXCLUDE may be a regular expression defining text to be diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el index c0cd4ee8c4..282fd3846a 100644 --- a/lisp/mail/rfc2047.el +++ b/lisp/mail/rfc2047.el @@ -293,7 +293,7 @@ Should be called narrowed to the head of the message." (if mail-parse-charset (encode-coding-region (point) (point-max) mail-parse-charset))) - ;; We get this when CC'ing messages to newsgroups with + ;; We get this when Cc'ing messages to newsgroups with ;; 8-bit names. The group name mail copy just got ;; unconditionally encoded. Previously, it would ask ;; whether to encode, which was quite confusing for the diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index ab0417bb5c..99c1a1c362 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -251,7 +251,7 @@ it from rmail file. Called for each new message retrieved by (setq message-subject (mail-fetch-field "Subject")) (setq message-content-type (mail-fetch-field "Content-Type")) (setq message-spam-status (mail-fetch-field "X-Spam-Status"))) - ;; Check for blind CC condition. Set vars such that while + ;; Check for blind cc condition. Set vars such that while ;; loop will be bypassed and spam condition will trigger. (and rsf-no-blind-cc (null message-recipients) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 0f4bb1f64d..12a58b293d 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -851,7 +851,7 @@ that knows the exact ordering of the \\( \\) subexpressions.") (beginning-of-line) (end-of-line) (1 font-lock-comment-delimiter-face nil t) (5 font-lock-comment-face nil t))) - '("^\\(X-[a-z0-9-]+\\|In-reply-to\\|Date\\):.*\\(\n[ \t]+.*\\)*$" + '("^\\(X-[a-z0-9-]+\\|In-Reply-To\\|Date\\):.*\\(\n[ \t]+.*\\)*$" . 'rmail-header-name)))) "Additional expressions to highlight in Rmail mode.") @@ -3789,7 +3789,7 @@ original message into it." (defun rmail-reply (just-sender) "Reply to the current message. -Normally include CC: to all other recipients of original message; +Normally include Cc: to all other recipients of original message; prefix argument means ignore them. While composing the reply, use \\[mail-yank-original] to yank the original message into it." (interactive "P") @@ -3823,7 +3823,7 @@ use \\[mail-yank-original] to yank the original message into it." (unless just-sender (if (mail-fetch-field "mail-followup-to" nil t) ;; If this header field is present, use it instead of the - ;; To and CC fields. + ;; To and Cc fields. (setq to (mail-fetch-field "mail-followup-to" nil t)) (setq cc (or (mail-fetch-field "cc" nil t) "") to (or (mail-fetch-field "to" nil t) "")))))) @@ -4275,7 +4275,7 @@ specifying headers which should not be copied into the new message." (if mail-self-blind (if resending (insert "Resent-Bcc: " (user-login-name) "\n") - (insert "BCC: " (user-login-name) "\n")))) + (insert "Bcc: " (user-login-name) "\n")))) (goto-char (point-min)) (mail-position-on-field (if resending "Resent-To" "To") t)))))) diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 692f67b87d..3dd486a792 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -1626,7 +1626,7 @@ original message into it." (defun rmail-summary-reply (just-sender) "Reply to the current message. -Normally include CC: to all other recipients of original message; +Normally include Cc: to all other recipients of original message; prefix argument means ignore them. While composing the reply, use \\[mail-yank-original] to yank the original message into it." (interactive "P") diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index f1c6d39599..aebc50f4fa 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -107,9 +107,9 @@ being sent is used), or nil (in which case the value of ;;;###autoload (defcustom mail-self-blind nil - "Non-nil means insert BCC to self in messages to be sent. + "Non-nil means insert Bcc to self in messages to be sent. This is done when the message is initialized, -so you can remove or alter the BCC field to override the default." +so you can remove or alter the Bcc field to override the default." :type 'boolean :group 'sendmail) @@ -188,7 +188,7 @@ be a Babyl file." ;;;###autoload (defcustom mail-default-reply-to nil - "Address to insert as default Reply-to field of outgoing messages. + "Address to insert as default Reply-To field of outgoing messages. If nil, it will be initialized from the REPLYTO environment variable when you first send mail." :type '(choice (const nil) string) @@ -473,7 +473,7 @@ by Emacs.)") (cite-prefix "[:alpha:]") (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) (list '("^\\(To\\|Newsgroups\\):" . font-lock-function-name-face) - '("^\\(B?CC\\|Reply-to\\|Mail-\\(reply\\|followup\\)-to\\):" . font-lock-keyword-face) + '("^\\(B?Cc\\|Reply-To\\|Mail-\\(Reply\\|Followup\\)-To\\):" . font-lock-keyword-face) '("^\\(Subject:\\)[ \t]*\\(.+\\)?" (1 font-lock-comment-face) ;; (2 font-lock-type-face nil t) @@ -493,7 +493,7 @@ by Emacs.)") (beginning-of-line) (end-of-line) (1 font-lock-comment-delimiter-face nil t) (5 font-lock-comment-face nil t))) - '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\):.*\\(\n[ \t]+.*\\)*$" + '("^\\(X-[A-Za-z0-9-]+\\|In-Reply-To\\):.*\\(\n[ \t]+.*\\)*$" . font-lock-string-face)))) "Additional expressions to highlight in Mail mode.") @@ -642,7 +642,7 @@ This also saves the value of `send-mail-function' via Customize." (newline)) (if cc (let ((fill-prefix "\t") - (address-start (progn (insert "CC: ") (point)))) + (address-start (progn (insert "Cc: ") (point)))) (insert cc "\n") (fill-region-as-paragraph address-start (point-max)) (goto-char (point-max)) @@ -652,7 +652,7 @@ This also saves the value of `send-mail-function' via Customize." (let ((fill-prefix "\t") (fill-column 78) (address-start (point))) - (insert "In-reply-to: " in-reply-to "\n") + (insert "In-Reply-To: " in-reply-to "\n") (fill-region-as-paragraph address-start (point-max)) (goto-char (point-max)) (unless (bolp) @@ -661,11 +661,11 @@ This also saves the value of `send-mail-function' via Customize." (if mail-default-headers (insert mail-default-headers)) (if mail-default-reply-to - (insert "Reply-to: " mail-default-reply-to "\n")) + (insert "Reply-To: " mail-default-reply-to "\n")) (if mail-self-blind - (insert "BCC: " user-mail-address "\n")) + (insert "Bcc: " user-mail-address "\n")) (if mail-archive-file-name - (insert "FCC: " mail-archive-file-name "\n")) + (insert "Fcc: " mail-archive-file-name "\n")) (put-text-property (point) (progn (insert mail-header-separator "\n") @@ -701,8 +701,8 @@ Like Text Mode but with these additional commands: Here are commands that move to a header field (and create it if there isn't): \\[mail-to] move to To: \\[mail-subject] move to Subj: - \\[mail-bcc] move to BCC: \\[mail-cc] move to CC: - \\[mail-fcc] move to FCC: \\[mail-reply-to] move to Reply-To: + \\[mail-bcc] move to Bcc: \\[mail-cc] move to Cc: + \\[mail-fcc] move to Fcc: \\[mail-reply-to] move to Reply-To: \\[mail-mail-reply-to] move to Mail-Reply-To: \\[mail-mail-followup-to] move to Mail-Followup-To: \\[mail-text] move to message text. @@ -913,7 +913,7 @@ the user from the mailer." (regexp-opt mail-mailing-lists t) "\\(?:[[:space:];,]\\|\\'\\)")))) (mail-combine-fields "To") - (mail-combine-fields "CC") + (mail-combine-fields "Cc") ;; If there are mailing lists defined (when ml (save-excursion @@ -1229,7 +1229,7 @@ external program defined by `sendmail-program'." ;; the message specially. (let ((case-fold-search t)) (goto-char (point-min)) - (while (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" delimline t) + (while (re-search-forward "^Resent-\\(To\\|Cc\\|Bcc\\):" delimline t) ;; Put a list of such addresses in resend-to-addresses. (setq resend-to-addresses (save-restriction @@ -1241,7 +1241,7 @@ external program defined by `sendmail-program'." (point))) (append (mail-parse-comma-list) resend-to-addresses))) - ;; Delete Resent-BCC ourselves + ;; Delete Resent-Bcc ourselves (if (save-excursion (beginning-of-line) (looking-at "resent-bcc")) (delete-region (line-beginning-position) @@ -1304,9 +1304,9 @@ external program defined by `sendmail-program'." (goto-char (1+ delimline)) (if (eval mail-mailer-swallows-blank-line) (newline)) - ;; Find and handle any FCC fields. + ;; Find and handle any Fcc fields. (goto-char (point-min)) - (if (re-search-forward "^FCC:" delimline t) + (if (re-search-forward "^Fcc:" delimline t) (progn (setq fcc-was-found t) (mail-do-fcc delimline))) @@ -1380,8 +1380,8 @@ external program defined by `sendmail-program'." (autoload 'rmail-output-to-rmail-buffer "rmailout") (defun mail-do-fcc (header-end) - "Find and act on any FCC: headers in the current message before HEADER-END. -If a buffer is visiting the FCC file, append to it before + "Find and act on any Fcc: headers in the current message before HEADER-END. +If a buffer is visiting the Fcc file, append to it before offering to save it, if it was modified initially. If this is an Rmail buffer, update Rmail as needed. If there is no buffer, just append to the file, in Babyl format if necessary." @@ -1393,7 +1393,7 @@ just append to the file, in Babyl format if necessary." (save-excursion (goto-char (point-min)) (let ((case-fold-search t)) - (while (re-search-forward "^FCC:[ \t]*" header-end t) + (while (re-search-forward "^Fcc:[ \t]*" header-end t) (push (buffer-substring (point) (progn (end-of-line) @@ -1472,7 +1472,7 @@ just append to the file, in Babyl format if necessary." ;; If the file is a Babyl file, convert the message to ;; Babyl format. Even though Rmail no longer uses ;; Babyl, this code can remain for the time being, on - ;; the off-chance one FCCs to a Babyl file that has + ;; the off-chance one Fccs to a Babyl file that has ;; not yet been converted to mbox. (let ((coding-system-for-write (or rmail-file-coding-system 'emacs-mule))) @@ -1493,7 +1493,7 @@ just append to the file, in Babyl format if necessary." (set-visited-file-modtime))))))))) (defun mail-sent-via () - "Make a Sent-via header line from each To or CC header line." + "Make a Sent-via header line from each To or Cc header line." (declare (obsolete "nobody can remember what it is for." "24.1")) (interactive) (save-excursion @@ -1528,7 +1528,7 @@ just append to the file, in Babyl format if necessary." (mail-position-on-field "Subject")) (defun mail-cc () - "Move point to end of CC field, creating it if necessary." + "Move point to end of Cc field, creating it if necessary." (interactive) (expand-abbrev) (or (mail-position-on-field "cc" t) @@ -1536,20 +1536,20 @@ just append to the file, in Babyl format if necessary." (insert "\nCC: ")))) (defun mail-bcc () - "Move point to end of BCC field, creating it if necessary." + "Move point to end of Bcc field, creating it if necessary." (interactive) (expand-abbrev) (or (mail-position-on-field "bcc" t) (progn (mail-position-on-field "to") - (insert "\nBCC: ")))) + (insert "\nBcc: ")))) (defun mail-fcc (folder) - "Add a new FCC field, with file name completion." + "Add a new Fcc field, with file name completion." (interactive "FFolder carbon copy: ") (expand-abbrev) - (or (mail-position-on-field "fcc" t) ;Put new field after exiting FCC. + (or (mail-position-on-field "fcc" t) ;Put new field after exiting Fcc. (mail-position-on-field "to")) - (insert "\nFCC: " folder)) + (insert "\nFcc: " folder)) (defun mail-reply-to () "Move point to end of Reply-To field, creating it if necessary." @@ -1852,13 +1852,13 @@ Various special commands starting with C-c are available in sendmail mode to move to message header fields: \\{mail-mode-map} -If `mail-self-blind' is non-nil, a BCC to yourself is inserted +If `mail-self-blind' is non-nil, a Bcc to yourself is inserted when the message is initialized. If `mail-default-reply-to' is non-nil, it should be an address (a string); -a Reply-to: field with that address is inserted. +a Reply-To: field with that address is inserted. -If `mail-archive-file-name' is non-nil, an FCC field with that file name +If `mail-archive-file-name' is non-nil, an Fcc field with that file name is inserted. The normal hook `mail-setup-hook' is run after the message is diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 403a5c3551..8bc3cc78d9 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -321,11 +321,11 @@ for `smtpmail-try-auth-method'.") (goto-char (1+ delimline)) (if (eval mail-mailer-swallows-blank-line) (newline)) - ;; Find and handle any FCC fields. + ;; Find and handle any Fcc fields. (goto-char (point-min)) - (if (re-search-forward "^FCC:" delimline t) + (if (re-search-forward "^Fcc:" delimline t) ;; Force `mail-do-fcc' to use the encoding of the mail - ;; buffer to encode outgoing messages on FCC files. + ;; buffer to encode outgoing messages on Fcc files. (let ((coding-system-for-write ;; mbox files must have Unix EOLs. (coding-system-change-eol-conversion @@ -992,9 +992,9 @@ Returns an error if the server cannot be contacted." ;; RESENT-* fields should stop processing of regular fields. (save-excursion (setq addr-regexp - (if (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" + (if (re-search-forward "^Resent-\\(To\\|Cc\\|Bcc\\):" header-end t) - "^Resent-\\(to\\|cc\\|bcc\\):" + "^Resent-\\(To\\|Cc\\|Bcc\\):" "^\\(To:\\|Cc:\\|Bcc:\\)"))) (while (re-search-forward addr-regexp header-end t) @@ -1027,14 +1027,14 @@ Returns an error if the server cannot be contacted." (setq smtpmail-recipient-address-list recipient-address-list)))))) (defun smtpmail-do-bcc (header-end) - "Delete [Resent-]BCC: and their continuation lines from the header area. -There may be multiple BCC: lines, and each may have arbitrarily + "Delete [Resent-]Bcc: and their continuation lines from the header area. +There may be multiple Bcc: lines, and each may have arbitrarily many continuation lines." (let ((case-fold-search t)) (save-excursion (goto-char (point-min)) - ;; iterate over all BCC: lines - (while (re-search-forward "^\\(RESENT-\\)?BCC:" header-end t) + ;; iterate over all Bcc: lines + (while (re-search-forward "^\\(RESENT-\\)?Bcc:" header-end t) (delete-region (match-beginning 0) (progn (forward-line 1) (point))) ;; get rid of any continuation lines diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index b948acfd52..dfe5c9c902 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -338,7 +338,7 @@ You might need to set `uce-mail-reader' before using this." (if mail-default-headers (insert mail-default-headers)) (if mail-default-reply-to - (insert "Reply-to: " mail-default-reply-to "\n")) + (insert "Reply-To: " mail-default-reply-to "\n")) (insert mail-header-separator "\n") ;; Insert all our text. Then go back to the place where we started. (if to (setq to (point))) diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 941529330e..1a77daff9b 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -324,7 +324,7 @@ message and scan line." ;; message in your +outbox, and best of all doesn't break threading for ;; the recipient if you reply to a message in your +outbox. (setq mh-send-args (concat "-msgid " mh-send-args)) - ;; The default BCC encapsulation will make a MIME message unreadable. + ;; The default Bcc encapsulation will make a MIME message unreadable. ;; With nmh use the -mime arg to prevent this. (if (and (mh-variant-p 'nmh) (mh-goto-header-field "Bcc:") diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el index 90e2411282..dae8de00bb 100644 --- a/lisp/mh-e/mh-show.el +++ b/lisp/mh-e/mh-show.el @@ -774,7 +774,7 @@ operation." ("^\\(Apparently-To:\\|Newsgroups:\\)\\(.*\\)" (1 'default) (2 'mh-show-cc)) - ("^\\(In-reply-to\\|Date\\):\\(.*\\)$" + ("^\\(In-Reply-To\\|Date\\):\\(.*\\)$" (1 'default) (2 'mh-show-date)) (mh-letter-header-font-lock diff --git a/lisp/obsolete/mailpost.el b/lisp/obsolete/mailpost.el index eebaa34de1..2f74faf1d6 100644 --- a/lisp/obsolete/mailpost.el +++ b/lisp/obsolete/mailpost.el @@ -54,10 +54,10 @@ site-init." (while (and (re-search-forward "\n\n\n*" delimline t) (< (point) delimline)) (replace-match "\n")) - ;; Find and handle any FCC fields. + ;; Find and handle any Fcc fields. (let ((case-fold-search t)) (goto-char (point-min)) - (if (re-search-forward "^FCC:" delimline t) + (if (re-search-forward "^Fcc:" delimline t) (mail-do-fcc delimline)) ;; If there is a From and no Sender, put it a Sender. (goto-char (point-min)) diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el index 27b8c10dc0..7fa0fe9b0e 100644 --- a/test/lisp/gnus/message-tests.el +++ b/test/lisp/gnus/message-tests.el @@ -102,8 +102,8 @@ (ert-deftest message-all-recipients () (ert-with-test-buffer (:name "message") (insert "To: Person 1 , Person 2 \n") - (insert "CC: Person 3 , Person 4 \n") - (insert "BCC: Person 5 , Person 6 \n") + (insert "Cc: Person 3 , Person 4 \n") + (insert "Bcc: Person 5 , Person 6 \n") (should (equal (message-all-recipients) '(("Person 1" "p1@p1.org") ("Person 2" "p2@p2.org") commit a32412b8aa3dc14d810054601d9502ccfd1dae57 Author: Noam Postavsky Date: Fri May 4 22:13:18 2018 -0400 * make-dist: Add '--no-info' option. diff --git a/make-dist b/make-dist index aba5c43c52..bafcae35f0 100755 --- a/make-dist +++ b/make-dist @@ -51,6 +51,7 @@ clean_up=no make_tar=no default_gzip=gzip newer="" +with_info=yes with_tests=no changelog=yes verbose=no @@ -77,6 +78,11 @@ while [ $# -gt 0 ]; do "--no-changelog" ) changelog=no ;; + ## This options tells make-dist to skip the info files. This can + ## be useful for creating a tarball purely for test purposes. + "--no-info" ) + with_info=no + ;; ## This option tells make-dist to make the distribution normally, then ## remove all files older than the given timestamp file. This is useful ## for creating incremental or patch distributions. @@ -124,6 +130,7 @@ while [ $# -gt 0 ]; do echo " --no-check don't check for bad file names etc." echo " --no-update don't recompile or do analogous things" echo " --no-changelog don't generate the top-level ChangeLog" + echo " --no-info don't include info files" echo " --snapshot same as --clean-up --no-update --tar --no-check" echo " --tar make a tar file" echo " --tests include the test/ directory" @@ -292,7 +299,7 @@ if [ $check = yes ]; then ## This exits with non-zero status if any .info files need ## rebuilding. - if [ -r Makefile ]; then + if [ -r Makefile ] && [ "$with_info" = "yes" ]; then echo "Checking to see if info files are up-to-date..." make --question info || error=yes fi @@ -331,8 +338,10 @@ if [ $update = yes ]; then rm -f src/stamp-h.in echo timestamp > src/stamp-h.in - echo "Updating Info files" - make info + if [ "$make_info" = yes ] ; then + echo "Updating Info files" + make info + fi echo "Updating finder, custom and autoload data" (cd lisp && make updates EMACS="$EMACS") @@ -596,7 +605,7 @@ for f in `find etc -type f`; do ln $f $tempdir/$f || exit done -if [ -d info ]; then # Skip in case we've built --without-makeinfo. +if [ "$with_info" = "yes" ]; then echo "Making links to 'info'" ln `find info -type f -print` ${tempdir}/info || exit fi commit bb591f139f0602af292c772f974dcc14dabb1deb Author: Alan Mackenzie Date: Sun May 20 13:28:14 2018 +0000 Enhance CC Mode's fontification, etc., of unterminated strings. String delimiters, including escaped new lines, of correctly terminated strings are left in font-lock-string-face. All others get font-lock-warning-face. The latter get syntax-table text properties on the opening string delim and the "terminating EOL". Correct two miscellaneous bugs: the handling of text properties on Java Mode's generic delimiters; the handling of c-just-done-before-change. * lisp/progmodes/cc-defs.el (c-point): New position 'eoll "end of logical line". (c-characterp): New macro. * lisp/progmodes/cc-fonts.el (c-font-lock-invalid-string): Removed. (c-basic-matchers-before): Use a simple matcher in place of the form around c-font-lock-invalid-string. * lisp/progmodes/cc-langs.el (c-get-state-before-change-functions): Add c-before-change-check-unbalanced-strings to the value for all modes except AWK Mode. Also add c-before-change-check-<>-operators to Java Mode, correcting an error in that mode's handling of generic delimiters. (c-before-font-lock-functions): Add c-after-change-re-mark-unbalanced-strings to the value for all modes except AWK Mode. (c-single-quotes-quote-strings, c-string-delims): New lang variables for future enhancements. (c-string-innards-re-alist): New lang variable. * lisp/progmodes/cc-mode.el (c-just-done-before-change): Do not set this variable when a change is the alteration of text properties. (c-basic-common-init): Set parse-sexp-lookup-properties (and the XEmacs equivalent) also for Pike Mode. (c-neutralize-CPP-line): No longer neutralize unbalanced quotes here. (c-unescaped-nls-in-string-p, c-multiline-string-start-is-being-detached) (c-pps-to-string-delim, c-before-change-check-unbalanced-strings) (c-after-change-re-mark-unbalanced-strings): New functions. (c-after-change): Fix a bug with the handling of c-just-done-before-change. diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 7ec57e03b3..53d665477c 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -219,6 +219,7 @@ one of the following symbols: `bol' -- beginning of line `eol' -- end of line +`eoll' -- end of logical line (i.e. without escaped NL) `bod' -- beginning of defun `eod' -- end of defun `boi' -- beginning of indentation @@ -254,6 +255,16 @@ to it is returned. This function does not modify the point or the mark." (end-of-line) (point)))) + ((eq position 'eoll) + `(save-excursion + ,@(if point `((goto-char ,point))) + (while (progn + (end-of-line) + (prog1 (eq (logand 1 (skip-chars-backward "\\\\")) 1))) + (beginning-of-line 2)) + (end-of-line) + (point))) + ((eq position 'boi) `(save-excursion ,@(if point `((goto-char ,point))) @@ -453,6 +464,13 @@ to it is returned. This function does not modify the point or the mark." `(int-to-char ,integer) integer)) +(defmacro c-characterp (arg) + ;; Return t when ARG is a character (XEmacs) or integer (Emacs), otherwise + ;; return nil. + (if (integerp ?c) + `(integerp ,arg) + `(characterp ,arg))) + (defmacro c-last-command-char () ;; The last character just typed. Note that `last-command-event' exists in ;; both Emacs and XEmacs, but with confusingly different meanings. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 7cac55e057..9d2517f252 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -682,33 +682,6 @@ stuff. Used on level 1 and higher." ''c-nonbreakable-space-face))) )) -(defun c-font-lock-invalid-string () - ;; Assuming the point is after the opening character of a string, - ;; fontify that char with `font-lock-warning-face' if the string - ;; decidedly isn't terminated properly. - ;; - ;; This function does hidden buffer changes. - (let ((start (1- (point)))) - (save-excursion - (and (eq (elt (parse-partial-sexp start (c-point 'eol)) 8) start) - (if (if (eval-when-compile (integerp ?c)) - ;; Emacs - (integerp c-multiline-string-start-char) - ;; XEmacs - (characterp c-multiline-string-start-char)) - ;; There's no multiline string start char before the - ;; string, so newlines aren't allowed. - (not (eq (char-before start) c-multiline-string-start-char)) - ;; Multiline strings are allowed anywhere if - ;; c-multiline-string-start-char is t. - (not c-multiline-string-start-char)) - (if c-string-escaped-newlines - ;; There's no \ before the newline. - (not (eq (char-before (point)) ?\\)) - ;; Escaped newlines aren't supported. - t) - (c-put-font-lock-face start (1+ start) 'font-lock-warning-face))))) - (defun c-font-lock-invalid-single-quotes (limit) ;; This function will be called from font-lock for a region bounded by POINT ;; and LIMIT, as though it were to identify a keyword for @@ -749,16 +722,12 @@ casts and declarations are fontified. Used on level 2 and higher." ;; `c-recognize-<>-arglists' is set. t `(;; Put a warning face on the opener of unclosed strings that - ;; can't span lines. Later font + ;; can't span lines and on the "terminating" newlines. Later font ;; lock packages have a `font-lock-syntactic-face-function' for ;; this, but it doesn't give the control we want since any ;; fontification done inside the function will be ;; unconditionally overridden. - ,(c-make-font-lock-search-function - ;; Match a char before the string starter to make - ;; `c-skip-comments-and-strings' work correctly. - (concat ".\\(" c-string-limit-regexp "\\)") - '((c-font-lock-invalid-string))) + ("\\s|" 0 font-lock-warning-face t nil) ;; Invalid single quotes. c-font-lock-invalid-single-quotes diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 4a7c79a6df..53cb7f7f72 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -472,21 +472,24 @@ so that all identifiers are recognized as words.") (c-lang-defconst c-get-state-before-change-functions ;; For documentation see the following c-lang-defvar of the same name. ;; The value here may be a list of functions or a single function. - t nil + t 'c-before-change-check-unbalanced-strings c++ '(c-extend-region-for-CPP c-before-change-check-raw-strings c-before-change-check-<>-operators c-depropertize-CPP c-invalidate-macro-cache c-truncate-bs-cache + c-before-change-check-unbalanced-strings c-parse-quotes-before-change) (c objc) '(c-extend-region-for-CPP c-depropertize-CPP c-invalidate-macro-cache c-truncate-bs-cache + c-before-change-check-unbalanced-strings c-parse-quotes-before-change) - java 'c-parse-quotes-before-change - ;; 'c-before-change-check-<>-operators + java '(c-parse-quotes-before-change + c-before-change-check-unbalanced-strings + c-before-change-check-<>-operators) awk 'c-awk-record-region-clear-NL) (c-lang-defvar c-get-state-before-change-functions (let ((fs (c-lang-const c-get-state-before-change-functions))) @@ -514,14 +517,17 @@ parameters \(point-min) and \(point-max).") ;; For documentation see the following c-lang-defvar of the same name. ;; The value here may be a list of functions or a single function. t '(c-depropertize-new-text + c-after-change-re-mark-unbalanced-strings c-change-expand-fl-region) (c objc) '(c-depropertize-new-text c-parse-quotes-after-change + c-after-change-re-mark-unbalanced-strings c-extend-font-lock-region-for-macros c-neutralize-syntax-in-CPP c-change-expand-fl-region) c++ '(c-depropertize-new-text c-parse-quotes-after-change + c-after-change-re-mark-unbalanced-strings c-extend-font-lock-region-for-macros c-after-change-re-mark-raw-strings c-neutralize-syntax-in-CPP @@ -529,6 +535,7 @@ parameters \(point-min) and \(point-max).") c-change-expand-fl-region) java '(c-depropertize-new-text c-parse-quotes-after-change + c-after-change-re-mark-unbalanced-strings c-restore-<>-properties c-change-expand-fl-region) awk '(c-depropertize-new-text @@ -611,6 +618,19 @@ EOL terminated statements." (c c++ objc) t) (c-lang-defvar c-has-bitfields (c-lang-const c-has-bitfields)) +(c-lang-defconst c-single-quotes-quote-strings + "Whether the language uses single quotes for multi-char strings." + t nil) +(c-lang-defvar c-single-quotes-quote-strings + (c-lang-const c-single-quotes-quote-strings)) + +(c-lang-defconst c-string-delims + "A list of characters which can delimit arbitrary length strings" + t (if (c-lang-const c-single-quotes-quote-strings) + '(?\" ?\') + '(?\"))) +(c-lang-defvar c-string-delims (c-lang-const c-string-delims)) + (c-lang-defconst c-has-quoted-numbers "Whether the language has numbers quoted like 4'294'967'295." t nil @@ -856,6 +876,28 @@ literal are multiline." (c-lang-defvar c-multiline-string-start-char (c-lang-const c-multiline-string-start-char)) +(c-lang-defconst c-string-innards-re-alist + ;; An alist of regexps matching the innards of a string, the key being the + ;; string's delimiter. + ;; + ;; The regexps' matches extend up to, but not including, the closing string + ;; delimiter or an unescaped NL. An EOL is part of the string only if it is + ;; escaped. + t (mapcar (lambda (delim) + (cons + delim + (concat "\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\\\n\r" + (string delim) + "]\\)*"))) + (and + (or (null (c-lang-const c-multiline-string-start-char)) + (c-characterp (c-lang-const c-multiline-string-start-char))) + (if (c-lang-const c-single-quotes-quote-strings) + '(?\" ?\') + '(?\"))))) +(c-lang-defvar c-string-innards-re-alist + (c-lang-const c-string-innards-re-alist)) + (c-lang-defconst c-opt-cpp-symbol "The symbol which starts preprocessor constructs when in the margin." t "#" diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index f42510932e..2427191eae 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -499,9 +499,10 @@ preferably use the `c-mode-menu' language constant directly." ;; `basic-save-buffer' does (insert ?\n) when `require-final-newline' is ;; non-nil; (ii) to detect when Emacs fails to invoke ;; `before-change-functions'. This can happen when reverting a buffer - see -;; bug #24094. It seems these failures happen only in GNU Emacs; XEmacs -;; seems to maintain the strict alternation of calls to -;; `before-change-functions' and `after-change-functions'. +;; bug #24094. It seems these failures happen only in GNU Emacs; XEmacs seems +;; to maintain the strict alternation of calls to `before-change-functions' +;; and `after-change-functions'. Note that this variable is not set when +;; `c-before-change' is invoked by a change to text properties. (defun c-basic-common-init (mode default-style) "Do the necessary initialization for the syntax handling routines @@ -563,7 +564,7 @@ that requires a literal mode spec at compile time." (when (or c-recognize-<>-arglists (c-major-mode-is 'awk-mode) - (c-major-mode-is '(java-mode c-mode c++-mode objc-mode))) + (c-major-mode-is '(java-mode c-mode c++-mode objc-mode pike-mode))) ;; We'll use the syntax-table text property to change the syntax ;; of some chars for this language, so do the necessary setup for ;; that. @@ -996,9 +997,9 @@ Note that the style variables are always made local to the buffer." ;; characters, ones which would interact syntactically with stuff outside ;; this region. ;; - ;; These are unmatched string delimiters, or unmatched - ;; parens/brackets/braces. An unclosed comment is regarded as valid, NOT - ;; obtrusive. + ;; These are unmatched parens/brackets/braces. An unclosed comment is + ;; regarded as valid, NOT obtrusive. Unbalanced strings are handled + ;; elsewhere. (save-excursion (let (s) (while @@ -1008,9 +1009,11 @@ Note that the style variables are always made local to the buffer." ((< (nth 0 s) 0) ; found an unmated ),},] (c-put-char-property (1- (point)) 'syntax-table '(1)) t) - ((nth 3 s) ; In a string - (c-put-char-property (nth 8 s) 'syntax-table '(1)) - t) + ;; Unbalanced strings are now handled by + ;; `c-before-change-check-unbalanced-strings', etc. + ;; ((nth 3 s) ; In a string + ;; (c-put-char-property (nth 8 s) 'syntax-table '(1)) + ;; t) ((> (nth 0 s) 0) ; In a (,{,[ (c-put-char-property (nth 1 s) 'syntax-table '(1)) t) @@ -1070,6 +1073,205 @@ Note that the style variables are always made local to the buffer." (forward-line)) ; no infinite loop with, e.g., "#//" ))))) +(defun c-unescaped-nls-in-string-p (&optional quote-pos) + ;; Return whether unescaped newlines can be inside strings. + ;; + ;; QUOTE-POS, if present, is the position of the opening quote of a string. + ;; Depending on the language, there might be a special character before it + ;; signifying the validity of such NLs. + (cond + ((null c-multiline-string-start-char) nil) + ((c-characterp c-multiline-string-start-char) + (and quote-pos + (eq (char-before quote-pos) c-multiline-string-start-char))) + (t t))) + +(defun c-multiline-string-start-is-being-detached (end) + ;; If (e.g.), the # character in Pike is being detached from the string + ;; opener it applies to, return t. Else return nil. END is the argument + ;; supplied to every before-change function. + (and (memq (char-after end) c-string-delims) + (c-characterp c-multiline-string-start-char) + (eq (char-before end) c-multiline-string-start-char))) + +(defun c-pps-to-string-delim (end) + ;; parse-partial-sexp forward to the next string quote, which is deemed to + ;; be a closing quote. Return nil. + ;; + ;; We remove string-fence syntax-table text properties from characters we + ;; pass over. + (let* ((start (point)) + (no-st-s `(0 nil nil ?\" nil nil 0 nil ,start nil nil)) + (st-s `(0 nil nil t nil nil 0 nil ,start nil nil)) + no-st-pos st-pos + ) + (parse-partial-sexp start end nil nil no-st-s 'syntax-table) + (setq no-st-pos (point)) + (goto-char start) + (while (progn + (parse-partial-sexp (point) end nil nil st-s 'syntax-table) + (c-clear-char-property (1- (point)) 'syntax-table) + (setq st-pos (point)) + (and (< (point) end) + (not (eq (char-before) ?\"))))) + (goto-char (min no-st-pos st-pos)) + nil)) + +(defun c-before-change-check-unbalanced-strings (beg end) + ;; If BEG or END is inside an unbalanced string, remove the syntax-table + ;; text property from respectively the start or end of the string. Also + ;; extend the region (c-new-BEG c-new-END) as necessary to cope with the + ;; change being the insertion of an odd number of quotes. + ;; + ;; POINT is undefined both at entry to and exit from this function, the + ;; buffer will have been widened, and match data will have been saved. + ;; + ;; This function is called exclusively as a before-change function via + ;; `c-get-state-before-change-functions'. + (c-save-buffer-state + ((end-limits + (progn + (goto-char (if (c-multiline-string-start-is-being-detached end) + (1+ end) + end)) + (c-literal-limits))) + (end-literal-type (and end-limits + (c-literal-type end-limits))) + (beg-limits + (progn + (goto-char beg) + (c-literal-limits))) + (beg-literal-type (and beg-limits + (c-literal-type beg-limits)))) + + (when (eq end-literal-type 'string) + (setq c-new-END (max c-new-END (cdr end-limits)))) + ;; It is possible the buffer change will include inserting a string quote. + ;; This could have the effect of flipping the meaning of any following + ;; quotes up until the next unescaped EOL. Also guard against the change + ;; being the insertion of \ before an EOL, escaping it. + (cond + ((c-characterp c-multiline-string-start-char) + ;; The text about to be inserted might contain a multiline string + ;; opener. Set c-new-END after anything which might be affected. + ;; Go to the end of the putative multiline string. + (goto-char end) + (c-pps-to-string-delim (point-max)) + (when (< (point) (point-max)) + (while + (and + (progn + (while + (and + (c-syntactic-re-search-forward + "\"\\|\\s|" (point-max) t t) + (progn + (c-clear-char-property (1- (point)) 'syntax-table) + (not (eq (char-before) ?\"))))) + (eq (char-before) ?\")) + (if (eq (char-before (1- (point))) + c-multiline-string-start-char) + (progn + (c-pps-to-string-delim (point-max)) + (< (point) (point-max))) + (c-pps-to-string-delim (c-point 'eoll)) + (< (point) (c-point 'eoll)))))) + (setq c-new-END (max (point) c-new-END))) + + ((< c-new-END (point-max)) + (goto-char (1+ c-new-END)) ; might be a newline. + ;; In the following regexp, the initial \n caters for a newline getting + ;; joined to a preceding \ by the removal of what comes between. + (re-search-forward "\n?\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\\\n\r]\\)*" nil t) + ;; We're at an EOLL or point-max. + (setq c-new-END (min (1+ (point)) (point-max))) + ;; FIXME!!! Write a clever comment here. + (goto-char c-new-END) + (when (equal (c-get-char-property (1- (point)) 'syntax-table) '(15)) + (backward-sexp) + (c-clear-char-property (1- c-new-END) 'syntax-table) + (c-clear-char-property (point) 'syntax-table))) + + (t (if (memq (char-before c-new-END) c-string-delims) + (c-clear-char-property (1- c-new-END) 'syntax-table)))) + + (when (eq end-literal-type 'string) + (c-clear-char-property (1- (cdr end-limits)) 'syntax-table)) + + (when (eq beg-literal-type 'string) + (setq c-new-BEG (min c-new-BEG (car beg-limits))) + (c-clear-char-property (car beg-limits) 'syntax-table)))) + +(defun c-after-change-re-mark-unbalanced-strings (beg _end _old-len) + ;; Mark any unbalanced strings in the region (c-new-BEG c-new-END) with + ;; string fence syntax-table text properties. + ;; + ;; POINT is undefined both at entry to and exit from this function, the + ;; buffer will have been widened, and match data will have been saved. + ;; + ;; This function is called exclusively as an after-change function via + ;; `c-before-font-lock-functions'. + (c-save-buffer-state + ((cll (progn (goto-char c-new-BEG) + (c-literal-limits))) + (beg-literal-type (and cll (c-literal-type cll))) + (beg-limits + (cond + ((and (eq beg-literal-type 'string) + (c-unescaped-nls-in-string-p (car cll))) + (cons + (car cll) + (progn + (goto-char (1+ (car cll))) + (search-forward-regexp + (cdr (assq (char-after (car cll)) c-string-innards-re-alist)) + nil t) + (min (1+ (point)) (point-max))))) + ((and (null beg-literal-type) + (goto-char beg) + (eq (char-before) c-multiline-string-start-char) + (memq (char-after) c-string-delims)) + (cons (point) + (progn + (forward-char) + (search-forward-regexp + (cdr (assq (char-before) c-string-innards-re-alist)) nil t) + (1+ (point))))) + (cll))) + s) + (goto-char + (cond ((null beg-literal-type) + c-new-BEG) + ((eq beg-literal-type 'string) + (car beg-limits)) + (t ; comment + (cdr beg-limits)))) + (while + (and + (< (point) c-new-END) + (progn + ;; Skip over any comments before the next string. + (while (progn + (setq s (parse-partial-sexp (point) c-new-END nil + nil s 'syntax-table)) + (and (not (nth 3 s)) + (< (point) c-new-END) + (not (memq (char-before) c-string-delims))))) + ;; We're at the start of a string. + (memq (char-before) c-string-delims))) + (if (c-unescaped-nls-in-string-p (1- (point))) + (looking-at "[^\"]*") + (looking-at (cdr (assq (char-before) c-string-innards-re-alist)))) + (cond + ((memq (char-after (match-end 0)) '(?\n ?\r)) + (c-put-char-property (1- (point)) 'syntax-table '(15)) + (c-put-char-property (match-end 0) 'syntax-table '(15))) + ((or (eq (match-end 0) (point-max)) + (eq (char-after (match-end 0)) ?\\)) ; \ at EOB + (c-put-char-property (1- (point)) 'syntax-table '(15)))) + (goto-char (min (1+ (match-end 0)) (point-max))) + (setq s nil)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Parsing of quotes. ;; @@ -1418,7 +1620,8 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".") ;; without an intervening call to `before-change-functions' when reverting ;; the buffer (see bug #24094). Whatever the cause, assume that the entire ;; buffer has changed. - (when (not c-just-done-before-change) + (when (and (not c-just-done-before-change) + (not (c-called-from-text-property-change-p))) (save-restriction (widen) (c-before-change (point-min) (point-max)) commit e2f68c144f83b4634096b8180ee9d5d56329a01d Author: Eli Zaretskii Date: Sun May 20 11:53:03 2018 +0300 * etc/HELLO: More reasonable placement of 'charset' properties. diff --git a/etc/HELLO b/etc/HELLO index f415ec088b..3aacbf90a0 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -7,80 +7,82 @@ some of the character sets that Emacs supports. Non-ASCII examples: - Europe: latin-iso8859-1¡Hola!, Grüß Gott, Hyvää päivää, Tere õhtust, Bonlatin-iso8859-3ġu - Czelatin-iso8859-2ść!, Dobrý den, cyrillic-iso8859-5Здравствуйте!, greek-iso8859-7Γειά σας, mule-unicode-0100-24ffგამარჯობა - Africa: ethiopicሠላም - Middle/Near East: hebrew-iso8859-8שלום, mule-unicode-0100-24ffالسّلام عليكم - South Asia: નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ, - ආයුබෝවන්, வணக்கம், నమస్కారం, tibetanབཀྲ་ཤིས་བདེ་ལེགས༎ - South East Asia: mule-unicode-0100-24ffជំរាបសួរ, laoສະບາຍດີ, mule-unicode-0100-24ffမင်္ဂလာပါ, thai-tis620สวัสดีครับ, Chvietnamese-viscii-lowerào bạn - East Asia: chinese-gb2312你好, chinese-big5-1早晨, japanese-jisx0208こんにちは, korean-ksc5601안녕하세요 - Misc: Elatin-iso8859-3ĥoŝanĝo ĉiuĵaŭde, mule-unicode-2500-33ff⠓⠑⠇⠇⠕, mule-unicode-0100-24ff∀ p ∈ world • hello p mule-unicode-2500-33ff□ - CJK variety: GB(chinese-gb2312元气,开发), BIG5(chinese-big5-1元氣,開發), JIS(japanese-jisx0208元気,開発), KSC(korean-ksc5601元氣,開發) - Unicode charset: Emule-unicode-0100-24ffĥoŝanĝo ĉiuĵaŭde, Γειά σας, שלום, Здравствуйте! + Europe: latin-iso8859-1¡Hola!, Grüß Gott, Hyvää päivää,latin-iso8859-15 Tere õhtust,latin-iso8859-3 Bonġu + Cześć!,latin-iso8859-2 Dobrý den,cyrillic-iso8859-5 Здравствуйте!,greek-iso8859-7 Γειά σας,mule-unicode-0100-24ff გამარჯობა + Africa:mule-unicode-0100-24ff ethiopicሠላም + Middle/Near East:hebrew-iso8859-8 שלום,mule-unicode-0100-24ff السّلام عليكم + South Asia:mule-unicode-0100-24ff નમસ્તે, नमस्ते, ನಮಸ್ಕಾರ, നമസ്കാരം, ଶୁଣିବେ, + ආයුබෝවන්, வணக்கம், నమస్కారం,tibetan བཀྲ་ཤིས་བདེ་ལེགས༎ + South East Asia:mule-unicode-0100-24ff ជំរាបសួរ,lao ສະບາຍດີ,mule-unicode-0100-24ff မင်္ဂလာပါ,thai-tis620 สวัสดีครับ,vietnamese-viscii-lower vietnamese-viscii-upperCvietnamese-viscii-lowerhào bạn + East Asia:chinese-gb2312 你好,chinese-big5-1 早晨,japanese-jisx0208 こんにちは,korean-ksc5601 안녕하세요 + Misc:latin-iso8859-3 Eĥoŝanĝo ĉiuĵaŭde,mule-unicode-2500-33ff ⠓⠑⠇⠇⠕,mule-unicode-0100-24ff ∀ p ∈ world • hello p mule-unicode-2500-33ff□ + CJK variety:chinese-gb2312 GB(元气,开发),chinese-big5-1 BIG5(元氣,開發),japanese-jisx0208 JIS(元気,開発),korean-ksc5601 KSC(元氣,開發) + Unicode charset:unicode Eĥoŝanĝo ĉiuĵaŭde, Γειά σας, שלום, Здравствуйте! LANGUAGE (NATIVE NAME) HELLO ---------------------- ----- -Amharic (አማርኛ) ሠላም +mule-unicode-0100-24ffAmharic (አማርኛ) ሠላም Arabic (العربيّة) السّلام عليكم Armenian (հայերեն) Բարև ձեզ Bengali (বাংলা) নমস্কার -Braille mule-unicode-2500-33ff⠓⠑⠇⠇⠕ -Burmese (mule-unicode-0100-24ffမြန်မာ) မင်္ဂလာပါ -C printf ("Hello, world!\n"); -Czech (latin-iso8859-2čeština) Dobrlatin-iso8859-1ý den -Danish (dansk) Hej / Goddag / Halløj +mule-unicode-2500-33ffBraille ⠓⠑⠇⠇⠕ +mule-unicode-0100-24ffBurmese (မြန်မာ) မင်္ဂလာပါ +C printf ("Hello, world!\n"); +latin-iso8859-2Czech (čeština) Dobrý den +latin-iso8859-1Danish (dansk) Hej / Goddag / Halløj Dutch (Nederlands) Hallo / Dag -Emacs emacs --no-splash -f view-hello-file +unicodeEmacs emacs --no-splash -f view-hello-file -Emoji unicode👋 -latin-iso8859-1English /japanese-jisx0213-1ˈipaɪlatin-iso8859-4ŋjapanese-jisx0213-1ɡlipaɪjapanese-jisx0213-1ʃ/ Hello -Esperanto Saluton (Elatin-iso8859-3ĥoŝanĝo ĉiuĵaŭde) -Estonian (eesti keel) Tere platin-iso8859-1äevast / Tere õhtust -Finnish (suomi) Hei / Hyvää päivää +Emoji 👋 +English ipa/ˈɪŋɡlɪʃ/ Hello +latin-iso8859-3Esperanto Saluton (Eĥoŝanĝo ĉiuĵaŭde) +latin-iso8859-15Estonian (eesti keel) Tere päevast / Tere õhtust +latin-iso8859-1Finnish (suomi) Hei / Hyvää päivää French (français) Bonjour / Salut -Georgian (mule-unicode-0100-24ffქართველი) გამარჯობა -German (Deutsch) Guten Tag / Grlatin-iso8859-1üß Gott -Greek (greek-iso8859-7ελληνικά) Γειά σας -Greek, ancient (mule-unicode-0100-24ffἑgreek-iso8859-7λληνική) Οmule-unicode-0100-24ffὖgreek-iso8859-7λέ τε καmule-unicode-0100-24ffὶ greek-iso8859-7μέγα χαmule-unicode-0100-24ffῖgreek-iso8859-7ρε -Gujarati (mule-unicode-0100-24ffગુજરાતી) નમસ્તે -Hebrew hebrew-iso8859-8(עברית)mule-unicode-0100-24ff hebrew-iso8859-8שלום -Hungarian (magyar) Szlatin-iso8859-2ép jó napot! -Hindi (mule-unicode-0100-24ffहिंदी) नमस्ते / नमस्कार । -Italian (italiano) Ciao / Buon giorno -Javanese (Jawa) System.out.println("Sugeng siang!"); -Kannada (ಕನ್ನಡ) ನಮಸ್ಕಾರ +mule-unicode-0100-24ffGeorgian (ქართველი) გამარჯობა +latin-iso8859-1German (Deutsch) Guten Tag / Grüß Gott +greek-iso8859-7Greek (ελληνικά) Γειά σας +mule-unicode-0100-24ffGreek, ancient (ἑλληνική) Οὖλέ τε καὶ μέγα χαῖρε +Gujarati (ગુજરાતી) નમસ્તે +hebrew-iso8859-8Hebrew (עברית) שלום +latin-iso8859-2Hungarian (magyar) Szép jó napot! +mule-unicode-0100-24ffHindi (हिंदी) नमस्ते / नमस्कार । +latin-iso8859-1Italian (italiano) Ciao / Buon giorno +Javanese (Jawa) System.out.println("Sugeng siang!"); +mule-unicode-0100-24ffKannada (ಕನ್ನಡ) ನಮಸ್ಕಾರ Khmer (ភាសាខ្មែរ) ជំរាបសួរ -Lao (laoພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ -Malayalam (mule-unicode-0100-24ffമലയാളം) നമസ്കാരം -Maltese (il-Malti) Bonlatin-iso8859-3ġu / Saħħa -Mathematics mule-unicode-0100-24ff∀ p ∈ world • hello p mule-unicode-2500-33ff□ -Mongolian (cyrillic-iso8859-5монгол хэл) Сайн байна уу? -Norwegian (norsk) Hei / God dag -Oriya (mule-unicode-0100-24ffଓଡ଼ିଆ) ଶୁଣିବେ -Polish (jlatin-iso8859-2ęzyk polski) Dzień dobry! / Cześć! -Russian (cyrillic-iso8859-5русский) Здраjapanese-jisx0213-1́cyrillic-iso8859-5вствуйте! -Sinhala (mule-unicode-0100-24ffසිංහල) ආයුබෝවන් -Slovak (slovenlatin-iso8859-2čina) Dobrlatin-iso8859-1ý delatin-iso8859-2ň +laoLao (ພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ +mule-unicode-0100-24ffMalayalam (മലയാളം) നമസ്കാരം +latin-iso8859-3Maltese (il-Malti) Bonġu / Saħħa +unicodeMathematics ∀ p ∈ world • hello p □ +cyrillic-iso8859-5Mongolian (монгол хэл) Сайн байна уу? +latin-iso8859-1Norwegian (norsk) Hei / God dag +mule-unicode-0100-24ffOriya (ଓଡ଼ିଆ) ଶୁଣିବେ +latin-iso8859-2Polish (język polski) Dzień dobry! / Cześć! +cyrillic-iso8859-5Russian (русский) Здра́вствуйте! +mule-unicode-0100-24ffSinhala (සිංහල) ආයුබෝවන් +latin-iso8859-2Slovak (slovenčina) Dobrý deň Slovenian (slovenščina) Pozdravljeni! Spanish (espalatin-iso8859-1ñol) ¡Hola! Swedish (svenska) Hej / Goddag / Hallå -Tamil (mule-unicode-0100-24ffதமிழ்) வணக்கம் +mule-unicode-0100-24ffTamil (தமிழ்) வணக்கம் Telugu (తెలుగు) నమస్కారం -Thai (thai-tis620ภาษาไทย) สวัสดีครับ / สวัสดีค่ะ -Tibetan (tibetanབོད་སྐད་) བཀྲ་ཤིས་བདེ་ལེགས༎ -Tigrigna (mule-unicode-0100-24ffትግርኛ) ሰላማት -Turkish (Tlatin-iso8859-1ürkçe) Merhaba -Ukrainian (cyrillic-iso8859-5українська) Вітаю -Vietnamese (tivietnamese-viscii-lowerếng Việt) Chlatin-iso8859-1ào bvietnamese-viscii-lowerạn +thai-tis620Thai (ภาษาไทย) สวัสดีครับ / สวัสดีค่ะ +tibetanTibetan (བོད་སྐད་) བཀྲ་ཤིས་བདེ་ལེགས༎ +mule-unicode-0100-24ffTigrigna (ትግርኛ) ሰላማት +latin-iso8859-9Turkish (Türkçe) Merhaba +cyrillic-iso8859-5Ukrainian (українська) Вітаю +vietnamese-viscii-lowerVietnamese (tiếng vietnamese-viscii-upperVvietnamese-viscii-loweriệt) vietnamese-viscii-upperChào bạn + -Japanese (japanese-jisx0208日本語) こんにちは / katakana-jisx0201ｺﾝﾆﾁﾊ -Chinese (chinese-gb2312中文,普通话,汉语) 你好 -Cantonese (chinese-big5-1粵語,廣東話) 早晨, 你好 -Korean (korean-ksc5601한글) 안녕하세요 / 안녕하십니까 +Japanese (日本語) こんにちは katakana-jisx0201/ ｺﾝﾆﾁﾊ +chinese-gb2312Chinese (中文,普通话,汉语) 你好 +chinese-big5-1Cantonese (粵語,廣東話) 早晨, 你好 +Korean (한글) 안녕하세요 / 안녕하십니까 +korean-ksc5601 unicode