diff options
| author | Paul Eggert | 2016-05-10 07:38:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-05-10 07:41:40 -0700 |
| commit | 433d366dc7b053048abf710d790ff62421dd1570 (patch) | |
| tree | f68895872dd0384664bb66a56371b64e5630db61 /doc | |
| parent | 8939ae68d430ef272194ac64144ceb58ae0dbd3f (diff) | |
| download | emacs-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.texi | 13 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 5 | ||||
| -rw-r--r-- | doc/lispref/tips.texi | 3 |
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 | |||
| 332 | specifies @var{mapvar}'s value as the keymap for any following | 332 | specifies @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. | ||
| 338 | This generates a left single quotation mark, an apostrophe, or a grave | 337 | This generates a left single quotation mark, an apostrophe, or a grave |
| 339 | accent depending on the value of @code{text-quoting-style}. | 338 | accent 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. | ||
| 344 | This generates a right single quotation mark or an apostrophe | 342 | This generates a right single quotation mark or an apostrophe |
| 345 | depending on the value of @code{text-quoting-style}. | 343 | depending 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. | |||
| 361 | If the variable's value is @code{curve}, the style is | 359 | If 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 |
| 364 | apostrophes. If the value is @code{grave}, the style is @t{`like | 362 | apostrophes. If the value is @code{grave}, |
| 363 | quotes are not translated and the style is @t{`like | ||
| 365 | this'} with grave accent and apostrophe, the standard style | 364 | this'} with grave accent and apostrophe, the standard style |
| 366 | before Emacs version 25. The default value @code{nil} | 365 | before Emacs version 25. The default value @code{nil} |
| 367 | acts like @code{curve} if curved single quotes are displayable, and | 366 | acts 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 |
| 842 | This function acts like @code{format}, except it also converts any | 842 | This function acts like @code{format}, except it also converts any |
| 843 | curved single quotes in @var{string} as per the value of | 843 | grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the |
| 844 | @code{text-quoting-style}, and treats grave accent (@t{`}) and | 844 | value of @code{text-quoting-style}. |
| 845 | apostrophe (@t{'}) as if they were curved single quotes. | ||
| 846 | 845 | ||
| 847 | A format that quotes with grave accents and apostrophes @t{`like | 846 | A format that quotes with grave accents and apostrophes @t{`like |
| 848 | this'} typically generates curved quotes @t{‘like this’}. In | 847 | this'} 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 |
| 680 | older convention was designed for now-obsolete displays in which grave | 680 | older convention was designed for now-obsolete displays in which grave |
| 681 | accent and apostrophe were mirror images. | 681 | accent and apostrophe were mirror images. |
| 682 | 682 | Documentation using this convention is converted to the user's | |
| 683 | Documentation using either convention is converted to the user's | ||
| 684 | preferred format when it is copied into a help buffer. @xref{Keys in | 683 | preferred format when it is copied into a help buffer. @xref{Keys in |
| 685 | Documentation}. | 684 | Documentation}. |
| 686 | 685 | ||