From 5e814e02f0b0b85fa486975eced09e4a7ed8ce5c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 5 May 2016 06:39:17 -0700
Subject: [PATCH] Minor doc fixes for quoting
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
* 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.
---
doc/lispref/control.texi | 13 +++++++------
doc/lispref/display.texi | 13 +++++++------
etc/NEWS | 19 ++++++-------------
3 files changed, 20 insertions(+), 25 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}:
error symbol @code{error}, and a list containing the string returned by
@code{format-message}.
-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.
+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}
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}).
The string is also added to the @file{*Messages*} buffer, but without
text properties (@pxref{Logging Messages}).
-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.
+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.
diff --git a/etc/NEWS b/etc/NEWS
index 7d6e5334e5c..6c522e06e9e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1476,11 +1476,12 @@ display of diagnostics and help, but not of info. As the variable is
not intended for casual use, it is not a user option.
+++
-** `message' now translates various sorts of single quotes in its
-format string according to the value of `text-quoting-style' (see
-above). This translation cannot be disabled. To get the old
-behavior of `message', use `format', which is not affected by
-`text-quoting-style', e.g. (message "%s" (format "...." foo bar)).
+** Message-issuing functions like 'message' and 'error' now translate
+various sorts of single quotes in their format strings according to
+the value of 'text-quoting-style' (see above). This translation
+cannot be disabled. To get the old behavior, use 'format', which is
+not affected by 'text-quoting-style', e.g., (message "%s" (format
+"...." foo bar)).
+++
** substitute-command-keys now replaces quotes.
@@ -1489,14 +1490,6 @@ value of 'text-quoting-style'. Doc strings in source code can use
either curved single quotes or grave accents and apostrophes. As
before, characters preceded by \= are output as-is.
-+++
-** Message-issuing functions 'error', 'message', etc. now convert quotes.
-They use the new 'format-message' function instead of plain 'format',
-so that they now follow user preference as per 'text-quoting-style'
-when processing curved single quotes, grave accents, and apostrophes
-in their format argument. To process % directives but not quotes, you
-can use calls like (message "%s" (format FORMAT ARG1 ... ARGn)).
-
+++
** The character classes [:alpha:] and [:alnum:] in regular expressions
now match multibyte characters using Unicode character properties.
--
2.39.5