aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-11-17 09:41:05 +0100
committerStefan Kangas2022-11-17 09:41:05 +0100
commitc04b17d5cb83efd92a4864a68cd1a50a791bb500 (patch)
tree7f89677c88160800b58bd05f7e2d999be0908ea2
parent93036209fae87dc620b27b2ce2e0146e6252113c (diff)
parent0636e1066bbafcd8219d9a8e09301c77f875d78b (diff)
downloademacs-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.texi6
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}
805displays something like this: 805displays something like this:
806 806
807@example 807@example
808fill-column is a variable defined in C source code. 808fill-column is a variable defined in @quoteleft{}C source code@quoteright{}.
809Its value is 70 809Its 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
816Documentation: 816Documentation:
@@ -1659,7 +1659,7 @@ events.
1659or lower case; @acronym{ASCII} or non-@acronym{ASCII}) are reserved 1659or lower case; @acronym{ASCII} or non-@acronym{ASCII}) are reserved
1660for users. Emacs itself will never bind those key sequences, and 1660for users. Emacs itself will never bind those key sequences, and
1661Emacs extensions should avoid binding them. In other words, users can 1661Emacs extensions should avoid binding them. In other words, users can
1662bind key sequences like @kbd{C-c a} or @kbd{C-c ç} and rely on these 1662bind key sequences like @kbd{C-c a} or @kbd{C-c @,{c}} and rely on these
1663never being shadowed by other Emacs bindings. 1663never being shadowed by other Emacs bindings.
1664 1664
1665@node Prefix Keymaps 1665@node Prefix Keymaps