diff options
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/control.texi | 11 | ||||
| -rw-r--r-- | doc/lispref/customize.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 11 | ||||
| -rw-r--r-- | doc/lispref/help.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 10 |
5 files changed, 32 insertions, 13 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 3f48c458c02..0cdb03548bf 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi | |||
| @@ -1100,10 +1100,13 @@ These examples show typical uses of @code{error}: | |||
| 1100 | error symbol @code{error}, and a list containing the string returned by | 1100 | error symbol @code{error}, and a list containing the string returned by |
| 1101 | @code{format-message}. | 1101 | @code{format-message}. |
| 1102 | 1102 | ||
| 1103 | In a format string containing single quotes, curved quotes @t{‘like | 1103 | The @code{text-quoting-style} variable controls what quotes are |
| 1104 | this’} and grave quotes @t{`like this'} work better than straight | 1104 | generated; @xref{Keys in Documentation}. A call using a format like |
| 1105 | quotes @t{'like this'}, as @code{error} typically formats every | 1105 | @t{"Missing `%s'"} with grave accents and apostrophes typically |
| 1106 | straight quote as a curved closing quote. | 1106 | generates a message like @t{"Missing ‘foo’"} with matching curved |
| 1107 | quotes. In contrast, a call using a format like @t{"Missing '%s'"} | ||
| 1108 | with only apostrophes typically generates a message like @t{"Missing | ||
| 1109 | ’foo’"} with only closing curved quotes, an unusual style in English. | ||
| 1107 | 1110 | ||
| 1108 | @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 |
| 1109 | verbatim, don't just write @code{(error @var{string})}. If @var{string} | 1112 | verbatim, don't just write @code{(error @var{string})}. If @var{string} |
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index 14e6eb3ab25..4a6f7f2162b 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi | |||
| @@ -66,9 +66,12 @@ cause confusion.} | |||
| 66 | 66 | ||
| 67 | @kindex group@r{, customization keyword} | 67 | @kindex group@r{, customization keyword} |
| 68 | @item :group @var{group} | 68 | @item :group @var{group} |
| 69 | Put this customization item in group @var{group}. When you use | 69 | Put this customization item in group @var{group}. If this keyword is |
| 70 | @code{:group} in a @code{defgroup}, it makes the new group a subgroup of | 70 | missing from a customization item, it'll be placed in the same group |
| 71 | @var{group}. | 71 | that was last defined (in the current file). |
| 72 | |||
| 73 | When you use @code{:group} in a @code{defgroup}, it makes the new | ||
| 74 | group a subgroup of @var{group}. | ||
| 72 | 75 | ||
| 73 | If you use this keyword more than once, you can put a single item into | 76 | If you use this keyword more than once, you can put a single item into |
| 74 | more than one group. Displaying any of those groups will show this | 77 | more than one group. Displaying any of those groups will show this |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 3673d114041..87126f9167a 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -265,10 +265,13 @@ properties, it is displayed with the specified faces (@pxref{Faces}). | |||
| 265 | The string is also added to the @file{*Messages*} buffer, but without | 265 | The string is also added to the @file{*Messages*} buffer, but without |
| 266 | text properties (@pxref{Logging Messages}). | 266 | text properties (@pxref{Logging Messages}). |
| 267 | 267 | ||
| 268 | In a format string containing single quotes, curved quotes @t{‘like | 268 | The @code{text-quoting-style} variable controls what quotes are |
| 269 | this’} and grave quotes @t{`like this'} work better than straight | 269 | generated; @xref{Keys in Documentation}. A call using a format like |
| 270 | quotes @t{'like this'}, as @code{message} typically formats every | 270 | @t{"Missing `%s'"} with grave accents and apostrophes typically |
| 271 | straight quote as a curved closing quote. | 271 | generates a message like @t{"Missing ‘foo’"} with matching curved |
| 272 | quotes. In contrast, a call using a format like @t{"Missing '%s'"} | ||
| 273 | with only apostrophes typically generates a message like @t{"Missing | ||
| 274 | ’foo’"} with only closing curved quotes, an unusual style in English. | ||
| 272 | 275 | ||
| 273 | In batch mode, the message is printed to the standard error stream, | 276 | In batch mode, the message is printed to the standard error stream, |
| 274 | followed by a newline. | 277 | followed by a newline. |
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 58a11f29a4c..b945e438f55 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi | |||
| @@ -335,10 +335,14 @@ specifies @var{mapvar}'s value as the keymap for any following | |||
| 335 | @item ‘ | 335 | @item ‘ |
| 336 | @itemx ` | 336 | @itemx ` |
| 337 | (left single quotation mark and grave accent) both stand 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 | ||
| 339 | accent depending on the value of @code{text-quoting-style}. | ||
| 338 | 340 | ||
| 339 | @item ’ | 341 | @item ’ |
| 340 | @itemx ' | 342 | @itemx ' |
| 341 | (right single quotation mark and apostrophe) both stand 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 | ||
| 345 | depending on the value of @code{text-quoting-style}. | ||
| 342 | 346 | ||
| 343 | @item \= | 347 | @item \= |
| 344 | quotes the following character and is discarded; thus, @samp{\=`} puts | 348 | quotes the following character and is discarded; thus, @samp{\=`} puts |
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index ce629aa8259..58ab02dbc41 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi | |||
| @@ -842,8 +842,14 @@ if any. | |||
| 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 | curved single quotes in @var{string} as per the value of |
| 844 | @code{text-quoting-style}, and treats grave accent (@t{`}) and | 844 | @code{text-quoting-style}, and treats grave accent (@t{`}) and |
| 845 | apostrophe (@t{'}) as if they were curved single quotes. @xref{Keys | 845 | apostrophe (@t{'}) as if they were curved single quotes. |
| 846 | in Documentation}. | 846 | |
| 847 | A format that quotes with grave accents and apostrophes @t{`like | ||
| 848 | this'} typically generates curved quotes @t{‘like this’}. In | ||
| 849 | contrast, a format that quotes with only apostrophes @t{'like this'} | ||
| 850 | typically generates two closing curved quotes @t{’like this’}, an | ||
| 851 | unusual style in English. @xref{Keys in Documentation}, for how the | ||
| 852 | @code{text-quoting-style} variable affects generated quotes. | ||
| 847 | @end defun | 853 | @end defun |
| 848 | 854 | ||
| 849 | @cindex @samp{%} in format | 855 | @cindex @samp{%} in format |