diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-11 08:38:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-11 08:38:34 -0700 |
| commit | e17cda4942adf353fb7adc4bcdaa61a1ae79db8d (patch) | |
| tree | ff5f524568260a2823023c2a8e7dde84fc6ae1e0 /doc/emacs | |
| parent | ef744119a7cbd0692c53704604e9bb6345c371b6 (diff) | |
| parent | 758e9a8ed49c15f7069a67cf0c2ce3c6f9a3f7e1 (diff) | |
| download | emacs-e17cda4942adf353fb7adc4bcdaa61a1ae79db8d.tar.gz emacs-e17cda4942adf353fb7adc4bcdaa61a1ae79db8d.tar.bz2 emacs-e17cda4942adf353fb7adc4bcdaa61a1ae79db8d.zip | |
Merge from origin/emacs-26
758e9a8 Revert "Don't mark main_thread (Bug#36155)"
1877b7b Don't mark main_thread (Bug#36155)
4904fb3 More quotation fixes (Bug#35885)
4cc4b5d ; * src/keyboard.c (tool_bar_items): Fix a typo. (Bug#36143)
b58ecaf Minor copyedits in efaq-w32
48422af Tiny improvement of documentation of major mode conventions
25d44d2 * nt/addpm.c (main): Fix buffer overflow
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/modes.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index 4505bb5dc2d..e01dfa2677b 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -207,7 +207,7 @@ amount of work you can lose in case of a crash. @xref{Auto Save}. @item Electric Quote mode automatically converts quotation marks. For -example, it requotes text typed @t{`like this'} to text @t{‘like +example, it requotes text typed @kbd{`like this'} to text @t{‘like this’}. You can control what kind of text it operates in, and you can disable it entirely in individual buffers. @xref{Quotation Marks}. diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 1928240a878..59423feeeae 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -429,7 +429,7 @@ this"}. Another common way is the curved quote convention, which uses left and right single or double quotation marks `@t{like this}' or ``@t{like this}''@footnote{ The curved single quote characters are U+2018 @sc{left single quotation -mark} and U+2018 @sc{right single quotation mark}; the curved double quotes +mark} and U+2019 @sc{right single quotation mark}; the curved double quotes are U+201C @sc{left double quotation mark} and U+201D @sc{right double quotation mark}. On text terminals which cannot display these characters, the Info reader might show them as the typewriter ASCII |