diff options
| author | Alan Mackenzie | 2017-09-22 21:52:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-10-01 11:27:16 +0000 |
| commit | 5f76ac150a28e4de940790f96f0f751c8ee5d4c7 (patch) | |
| tree | c5bcacf053fcb197638073f3f167719831f17ff8 /doc | |
| parent | d5e4e004fa134cb81989bcf40c5d6c79b837301f (diff) | |
| download | emacs-5f76ac150a28e4de940790f96f0f751c8ee5d4c7.tar.gz emacs-5f76ac150a28e4de940790f96f0f751c8ee5d4c7.zip | |
Make the value nil in text-quoting-style mean what it does in Emacs 25.
This is a partial reversion of yesterday's commit by the same author, which
changed the meaning of nil and introduced the new value t.
* src/doc.c (text_quoting_style, text-quoting-style)
(internal--text-quoting-flag): Revert yesterday's changes.
* lisp/cus-start.el: (top level): Amend the entry for text-quoting-style.
* etc/NEWS: Amend the entry for text-quoting-style.
* doc/lispref/control.texi (Signalling Errors)
* doc/lispref/display.texi (Displaying Messages)
* doc/lispref/strings.texi (Formatting Strings): Bind text-quoting-style to
grave rather than nil to inhibit translation of quotes.
* doc/lispref/help.texi (Keys in Documentation): Revert the description of the
proposed new default, t.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/control.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/help.texi | 10 | ||||
| -rw-r--r-- | doc/lispref/strings.texi | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index 09435f57966..c39e035459e 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi | |||
| @@ -1109,7 +1109,7 @@ quotes. In contrast, a call using a format like @t{"Missing '%s'"} | |||
| 1109 | with only apostrophes typically generates a message like @t{"Missing | 1109 | with only apostrophes typically generates a message like @t{"Missing |
| 1110 | ’foo’"} with only closing curved quotes, an unusual style in English. | 1110 | ’foo’"} with only closing curved quotes, an unusual style in English. |
| 1111 | One way around this problem is to bind @code{text-quoting-style} to | 1111 | One way around this problem is to bind @code{text-quoting-style} to |
| 1112 | @code{nil} around the call to @code{error}; this causes the | 1112 | the symbol @code{grave} around the call to @code{error}; this causes |
| 1113 | @acronym{ASCII} quote characters to be output unchanged. | 1113 | @acronym{ASCII} quote characters to be output unchanged. |
| 1114 | 1114 | ||
| 1115 | @strong{Warning:} If you want to use your own string as an error message | 1115 | @strong{Warning:} If you want to use your own string as an error message |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 8f58fca506f..62b136f6c60 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -273,7 +273,7 @@ quotes. In contrast, a call using a format like @t{"Missing '%s'"} | |||
| 273 | with only apostrophes typically generates a message like @t{"Missing | 273 | with only apostrophes typically generates a message like @t{"Missing |
| 274 | ’foo’"} with only closing curved quotes, an unusual style in English. | 274 | ’foo’"} with only closing curved quotes, an unusual style in English. |
| 275 | One way around this problem is to bind @code{text-quoting-style} to | 275 | One way around this problem is to bind @code{text-quoting-style} to |
| 276 | @code{nil} around calls to @code{message}; this causes the | 276 | the symbol @code{grave} around calls to @code{message}; this causes |
| 277 | @acronym{ASCII} quote characters to be output unchanged. | 277 | @acronym{ASCII} quote characters to be output unchanged. |
| 278 | 278 | ||
| 279 | In batch mode, the message is printed to the standard error stream, | 279 | In batch mode, the message is printed to the standard error stream, |
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index e1e98124e08..74dc6dac9cb 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi | |||
| @@ -359,11 +359,11 @@ should use for single quotes in the wording of help and messages. If | |||
| 359 | the variable's value is @code{curve}, the style is @t{‘like this’} | 359 | the variable's value is @code{curve}, the style is @t{‘like this’} |
| 360 | with curved single quotes. If the value is @code{straight}, the style | 360 | with curved single quotes. If the value is @code{straight}, the style |
| 361 | is @t{'like this'} with straight apostrophes. If the value is | 361 | is @t{'like this'} with straight apostrophes. If the value is |
| 362 | @code{nil} or @code{grave}, quotes are not translated and the style is | 362 | @code{grave}, quotes are not translated and the style is @t{`like |
| 363 | @t{`like this'} with grave accent and apostrophe, the standard style | 363 | this'} with grave accent and apostrophe, the standard style before |
| 364 | before Emacs version 25. The default value @code{t} acts like | 364 | Emacs version 25. The default value @code{nil} acts like @code{curve} |
| 365 | @code{curve} if curved single quotes seem to be displayable, and like | 365 | if curved single quotes seem to be displayable, and like @code{grave} |
| 366 | @code{nil} otherwise. | 366 | otherwise. |
| 367 | 367 | ||
| 368 | This option is useful on platforms that have problems with curved | 368 | This option is useful on platforms that have problems with curved |
| 369 | quotes. You can customize it freely according to your personal | 369 | quotes. You can customize it freely according to your personal |
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 117a373a190..10385e05501 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi | |||
| @@ -836,10 +836,10 @@ this'} typically generates curved quotes @t{‘like this’}. In | |||
| 836 | contrast, a format that quotes with only apostrophes @t{'like this'} | 836 | contrast, a format that quotes with only apostrophes @t{'like this'} |
| 837 | typically generates two closing curved quotes @t{’like this’}, an | 837 | typically generates two closing curved quotes @t{’like this’}, an |
| 838 | unusual style in English. One way around such problems is to bind | 838 | unusual style in English. One way around such problems is to bind |
| 839 | @code{text-quoting-style} to @code{nil} around calls to | 839 | @code{text-quoting-style} to the symbol @code{grave} around calls to |
| 840 | @code{format-message}; this causes the @acronym{ASCII} quoting | 840 | @code{format-message}; this causes @acronym{ASCII} quoting characters |
| 841 | characters to be output unchanged. @xref{Keys in Documentation}, for | 841 | to be output unchanged. @xref{Keys in Documentation}, for how the |
| 842 | how the @code{text-quoting-style} variable affects generated quotes. | 842 | @code{text-quoting-style} variable affects generated quotes. |
| 843 | @end defun | 843 | @end defun |
| 844 | 844 | ||
| 845 | @cindex @samp{%} in format | 845 | @cindex @samp{%} in format |