diff options
| author | Stefan Kangas | 2022-11-17 09:41:05 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-11-17 09:41:05 +0100 |
| commit | c04b17d5cb83efd92a4864a68cd1a50a791bb500 (patch) | |
| tree | 7f89677c88160800b58bd05f7e2d999be0908ea2 | |
| parent | 93036209fae87dc620b27b2ce2e0146e6252113c (diff) | |
| parent | 0636e1066bbafcd8219d9a8e09301c77f875d78b (diff) | |
| download | emacs-c04b17d5cb83efd92a4864a68cd1a50a791bb500.tar.gz emacs-c04b17d5cb83efd92a4864a68cd1a50a791bb500.zip | |
Merge from origin/emacs-28
0636e1066b ; Don't unnecessarily use non-ASCII characters in Texinfo
# Conflicts:
# doc/emacs/custom.texi
| -rw-r--r-- | doc/emacs/custom.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 08ada2a70bb..aaf41d2aef1 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -805,12 +805,12 @@ C-h v fill-column @key{RET} | |||
| 805 | displays something like this: | 805 | displays something like this: |
| 806 | 806 | ||
| 807 | @example | 807 | @example |
| 808 | fill-column is a variable defined in ‘C source code’. | 808 | fill-column is a variable defined in @quoteleft{}C source code@quoteright{}. |
| 809 | Its value is 70 | 809 | Its value is 70 |
| 810 | 810 | ||
| 811 | Automatically becomes buffer-local when set. | 811 | Automatically becomes buffer-local when set. |
| 812 | This variable is safe as a file local variable if its value | 812 | This variable is safe as a file local variable if its value |
| 813 | satisfies the predicate ‘integerp’. | 813 | satisfies the predicate @quoteleft{}integerp@quoteright{}. |
| 814 | Probably introduced at or before Emacs version 18. | 814 | Probably introduced at or before Emacs version 18. |
| 815 | 815 | ||
| 816 | Documentation: | 816 | Documentation: |
| @@ -1659,7 +1659,7 @@ events. | |||
| 1659 | or lower case; @acronym{ASCII} or non-@acronym{ASCII}) are reserved | 1659 | or lower case; @acronym{ASCII} or non-@acronym{ASCII}) are reserved |
| 1660 | for users. Emacs itself will never bind those key sequences, and | 1660 | for users. Emacs itself will never bind those key sequences, and |
| 1661 | Emacs extensions should avoid binding them. In other words, users can | 1661 | Emacs extensions should avoid binding them. In other words, users can |
| 1662 | bind key sequences like @kbd{C-c a} or @kbd{C-c ç} and rely on these | 1662 | bind key sequences like @kbd{C-c a} or @kbd{C-c @,{c}} and rely on these |
| 1663 | never being shadowed by other Emacs bindings. | 1663 | never being shadowed by other Emacs bindings. |
| 1664 | 1664 | ||
| 1665 | @node Prefix Keymaps | 1665 | @node Prefix Keymaps |