aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2016-05-10 07:38:23 -0700
committerPaul Eggert2016-05-10 07:41:40 -0700
commit433d366dc7b053048abf710d790ff62421dd1570 (patch)
treef68895872dd0384664bb66a56371b64e5630db61 /doc
parent8939ae68d430ef272194ac64144ceb58ae0dbd3f (diff)
downloademacs-433d366dc7b053048abf710d790ff62421dd1570.tar.gz
emacs-433d366dc7b053048abf710d790ff62421dd1570.zip
'text-quoting-style' now affects only ` and '
Change 'text-quoting-style' so that it no longer affects formatting of curved quotes in format arguments to functions like 'message'. In particular, when this variable's value is 'grave', all quotes in formats are output as-is. * doc/lispref/help.texi (Keys in Documentation): * doc/lispref/strings.texi (Formatting Strings): * doc/lispref/tips.texi (Documentation Tips): * etc/NEWS: * src/doc.c (syms_of_doc): Document this. * lisp/help-fns.el (describe-function-1): * src/doc.c (text_quoting_style, Fsubstitute_command_keys) (syms_of_doc): * src/editfns.c (styled_format): Omit now-unnecessary code. * src/lisp.h (LEAVE_QUOTING_STYLE): Remove.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/help.texi13
-rw-r--r--doc/lispref/strings.texi5
-rw-r--r--doc/lispref/tips.texi3
3 files changed, 9 insertions, 12 deletions
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index b945e438f55..1bb2c7c4d08 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -332,15 +332,13 @@ stands for no text itself. It is used only for a side effect: it
332specifies @var{mapvar}'s value as the keymap for any following 332specifies @var{mapvar}'s value as the keymap for any following
333@samp{\[@var{command}]} sequences in this documentation string. 333@samp{\[@var{command}]} sequences in this documentation string.
334 334
335@item ‘ 335@item `
336@itemx ` 336(grave accent) stands for a left quote.
337(left single quotation mark and grave accent) both stand for a left quote.
338This generates a left single quotation mark, an apostrophe, or a grave 337This generates a left single quotation mark, an apostrophe, or a grave
339accent depending on the value of @code{text-quoting-style}. 338accent depending on the value of @code{text-quoting-style}.
340 339
341@item ’ 340@item '
342@itemx ' 341(apostrophe) stands for a right quote.
343(right single quotation mark and apostrophe) both stand for a right quote.
344This generates a right single quotation mark or an apostrophe 342This generates a right single quotation mark or an apostrophe
345depending on the value of @code{text-quoting-style}. 343depending on the value of @code{text-quoting-style}.
346 344
@@ -361,7 +359,8 @@ should use for single quotes in the wording of help and messages.
361If the variable's value is @code{curve}, the style is 359If the variable's value is @code{curve}, the style is
362@t{‘like this’} with curved single quotes. If the value is 360@t{‘like this’} with curved single quotes. If the value is
363@code{straight}, the style is @t{'like this'} with straight 361@code{straight}, the style is @t{'like this'} with straight
364apostrophes. If the value is @code{grave}, the style is @t{`like 362apostrophes. If the value is @code{grave},
363quotes are not translated and the style is @t{`like
365this'} with grave accent and apostrophe, the standard style 364this'} with grave accent and apostrophe, the standard style
366before Emacs version 25. The default value @code{nil} 365before Emacs version 25. The default value @code{nil}
367acts like @code{curve} if curved single quotes are displayable, and 366acts like @code{curve} if curved single quotes are displayable, and
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 58ab02dbc41..cf0505f4467 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -840,9 +840,8 @@ if any.
840@cindex curved quotes 840@cindex curved quotes
841@cindex curly quotes 841@cindex curly quotes
842This function acts like @code{format}, except it also converts any 842This function acts like @code{format}, except it also converts any
843curved single quotes in @var{string} as per the value of 843grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the
844@code{text-quoting-style}, and treats grave accent (@t{`}) and 844value of @code{text-quoting-style}.
845apostrophe (@t{'}) as if they were curved single quotes.
846 845
847A format that quotes with grave accents and apostrophes @t{`like 846A format that quotes with grave accents and apostrophes @t{`like
848this'} typically generates curved quotes @t{‘like this’}. In 847this'} typically generates curved quotes @t{‘like this’}. In
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index d12de7aee2d..a8589df031c 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -679,8 +679,7 @@ which quotes symbols with grave accent @t{`} and apostrophe
679@t{'}: @t{`like-this'} rather than @t{‘like-this’}. This 679@t{'}: @t{`like-this'} rather than @t{‘like-this’}. This
680older convention was designed for now-obsolete displays in which grave 680older convention was designed for now-obsolete displays in which grave
681accent and apostrophe were mirror images. 681accent and apostrophe were mirror images.
682 682Documentation using this convention is converted to the user's
683Documentation using either convention is converted to the user's
684preferred format when it is copied into a help buffer. @xref{Keys in 683preferred format when it is copied into a help buffer. @xref{Keys in
685Documentation}. 684Documentation}.
686 685