aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2016-05-05 06:39:17 -0700
committerPaul Eggert2016-05-05 06:40:12 -0700
commit5e814e02f0b0b85fa486975eced09e4a7ed8ce5c (patch)
tree0e3d4677bd2e193558ea7245ad176afeae6abd57 /doc
parent3347a733e0778dfefaeabe28ae73f4226236a881 (diff)
downloademacs-5e814e02f0b0b85fa486975eced09e4a7ed8ce5c.tar.gz
emacs-5e814e02f0b0b85fa486975eced09e4a7ed8ce5c.zip
Minor doc fixes for quoting
* doc/lispref/control.texi (Signaling Errors): * doc/lispref/display.texi (Displaying Messages): Don’t say that formats “generate”. Try to word more clearly. * etc/NEWS: Coalesce near-duplicate entries.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/control.texi13
-rw-r--r--doc/lispref/display.texi13
2 files changed, 14 insertions, 12 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 75d8d284623..0cdb03548bf 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1100,12 +1100,13 @@ These examples show typical uses of @code{error}:
1100error symbol @code{error}, and a list containing the string returned by 1100error symbol @code{error}, and a list containing the string returned by
1101@code{format-message}. 1101@code{format-message}.
1102 1102
1103A format that quotes with grave accents and apostrophes @t{`like 1103The @code{text-quoting-style} variable controls what quotes are
1104this'} typically generates curved quotes @t{‘like this’}. In 1104generated; @xref{Keys in Documentation}. A call using a format like
1105contrast, a format that quotes with only apostrophes @t{'like this'} 1105@t{"Missing `%s'"} with grave accents and apostrophes typically
1106typically generates two closing curved quotes @t{’like this’}, an 1106generates a message like @t{"Missing ‘foo’"} with matching curved
1107unusual style in English. @xref{Keys in Documentation}, for how the 1107quotes. In contrast, a call using a format like @t{"Missing '%s'"}
1108@code{text-quoting-style} variable affects generated quotes. 1108with only apostrophes typically generates a message like @t{"Missing
1109’foo’"} with only closing curved quotes, an unusual style in English.
1109 1110
1110@strong{Warning:} If you want to use your own string as an error message 1111@strong{Warning:} If you want to use your own string as an error message
1111verbatim, don't just write @code{(error @var{string})}. If @var{string} 1112verbatim, don't just write @code{(error @var{string})}. If @var{string}
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b0cd8731fe2..181bff09b55 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -265,12 +265,13 @@ properties, it is displayed with the specified faces (@pxref{Faces}).
265The string is also added to the @file{*Messages*} buffer, but without 265The string is also added to the @file{*Messages*} buffer, but without
266text properties (@pxref{Logging Messages}). 266text properties (@pxref{Logging Messages}).
267 267
268A format that quotes with grave accents and apostrophes @t{`like 268The @code{text-quoting-style} variable controls what quotes are
269this'} typically generates curved quotes @t{‘like this’}. In 269generated; @xref{Keys in Documentation}. A call using a format like
270contrast, a format that quotes with only apostrophes @t{'like this'} 270@t{"Missing `%s'"} with grave accents and apostrophes typically
271typically generates two closing curved quotes @t{’like this’}, an 271generates a message like @t{"Missing ‘foo’"} with matching curved
272unusual style in English. @xref{Keys in Documentation}, for how the 272quotes. In contrast, a call using a format like @t{"Missing '%s'"}
273@code{text-quoting-style} variable affects generated quotes. 273with only apostrophes typically generates a message like @t{"Missing
274’foo’"} with only closing curved quotes, an unusual style in English.
274 275
275In batch mode, the message is printed to the standard error stream, 276In batch mode, the message is printed to the standard error stream,
276followed by a newline. 277followed by a newline.