mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 18:41:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
50650cb Doc fixes for fclist and grep
5e814e0 Minor doc fixes for quoting
3347a73 `nreverse' the marker pairs list
1a4127d Use save-excursion in xref-location-marker more
ab3ba91 shell-quote-argument DIR when appropriate
922c7a3 Rework xref-query-replace-in-results
3fe3510 * lisp/replace.el (query-replace-read-from): Use minibuffer-w...
0932b94 Fix todo-mode bug involving archived items (bug#23447)
e68ad1f ; * etc/NEWS: Tiny edit. (Bug#23432)
adc80b7 ; * test/automated/xref-tests.el: Add copyright and license.
4d8fd9c Handle "empty line" regexp in xref searches
f559b37 Add tests for xref-collect-matches
6428aa0 Use grep-find-ignored-directories instead of vc-directory-exc...
6f82d8e Clear buffer-undo-list when showing xrefs
c68a091 Note the quote translation in `message' in section "incompati...
52f86a7 * etc/NEWS: Mention (message "%s" (format ...)).
93703c5 (Common Keywords): Correct what missing :group means
79e5800 Improve documentation of Dired's 'A' and 'Q' commands
2ea2a2f Doc fixes for quoting
8544b98 posnp doc clarification
805204f Mention what a missing :group does
ec554d7 Fix documentation of dired-aux search/replace commands
This commit is contained in:
Paul Eggert 2016-05-05 23:11:11 -07:00
commit 89ce83b202
29 changed files with 343 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/lispref/control.texi
View file

@ -1100,10 +1100,13 @@ These examples show typical uses of @code{error}:
error symbol @code{error}, and a list containing the string returned by
@code{format-message}.
In a format string containing single quotes, curved quotes @t{‘like
this’} and grave quotes @t{`like this'} work better than straight
quotes @t{'like this'}, as @code{error} typically formats every
straight quote as a curved closing quote.
The @code{text-quoting-style} variable controls what quotes are
generated; @xref{Keys in Documentation}. A call using a format like
@t{"Missing `%s'"} with grave accents and apostrophes typically
generates a message like @t{"Missing ‘foo’"} with matching curved
quotes. In contrast, a call using a format like @t{"Missing '%s'"}
with only apostrophes typically generates a message like @t{"Missing
’foo’"} with only closing curved quotes, an unusual style in English.
@strong{Warning:} If you want to use your own string as an error message
verbatim, don't just write @code{(error @var{string})}. If @var{string}

9
doc/lispref/customize.texi
View file

@ -66,9 +66,12 @@ cause confusion.}
@kindex group@r{, customization keyword}
@item :group @var{group}
Put this customization item in group @var{group}. When you use
@code{:group} in a @code{defgroup}, it makes the new group a subgroup of
@var{group}.
Put this customization item in group @var{group}. If this keyword is
missing from a customization item, it'll be placed in the same group
that was last defined (in the current file).
When you use @code{:group} in a @code{defgroup}, it makes the new
group a subgroup of @var{group}.
If you use this keyword more than once, you can put a single item into
more than one group. Displaying any of those groups will show this

11
doc/lispref/display.texi
View file

@ -265,10 +265,13 @@ properties, it is displayed with the specified faces (@pxref{Faces}).
The string is also added to the @file{*Messages*} buffer, but without
text properties (@pxref{Logging Messages}).
In a format string containing single quotes, curved quotes @t{‘like
this’} and grave quotes @t{`like this'} work better than straight
quotes @t{'like this'}, as @code{message} typically formats every
straight quote as a curved closing quote.
The @code{text-quoting-style} variable controls what quotes are
generated; @xref{Keys in Documentation}. A call using a format like
@t{"Missing `%s'"} with grave accents and apostrophes typically
generates a message like @t{"Missing ‘foo’"} with matching curved
quotes. In contrast, a call using a format like @t{"Missing '%s'"}
with only apostrophes typically generates a message like @t{"Missing
’foo’"} with only closing curved quotes, an unusual style in English.
In batch mode, the message is printed to the standard error stream,
followed by a newline.

4
doc/lispref/help.texi
View file

@ -335,10 +335,14 @@ specifies @var{mapvar}'s value as the keymap for any following
@item ‘
@itemx `
(left single quotation mark and grave accent) both stand for a left quote.
This generates a left single quotation mark, an apostrophe, or a grave
accent depending on the value of @code{text-quoting-style}.
@item ’
@itemx '
(right single quotation mark and apostrophe) both stand for a right quote.
This generates a right single quotation mark or an apostrophe
depending on the value of @code{text-quoting-style}.
@item \=
quotes the following character and is discarded; thus, @samp{\=`} puts

10
doc/lispref/strings.texi
View file

@ -842,8 +842,14 @@ if any.
This function acts like @code{format}, except it also converts any
curved single quotes in @var{string} as per the value of
@code{text-quoting-style}, and treats grave accent (@t{`}) and
apostrophe (@t{'}) as if they were curved single quotes. @xref{Keys
in Documentation}.
apostrophe (@t{'}) as if they were curved single quotes.
A format that quotes with grave accents and apostrophes @t{`like
this'} typically generates curved quotes @t{‘like this’}. In
contrast, a format that quotes with only apostrophes @t{'like this'}
typically generates two closing curved quotes @t{’like this’}, an
unusual style in English. @xref{Keys in Documentation}, for how the
@code{text-quoting-style} variable affects generated quotes.
@end defun
@cindex @samp{%} in format