summaryrefslogtreecommitdiff
path: root/doc/lispref/nonascii.texi
diff options
context:
space:
mode:
authorYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
committerYuuki Harano <masm+github@masm11.me>2021-11-11 00:39:53 +0900
commit4dd1f56f29fc598a8339a345c2f8945250600602 (patch)
treeaf341efedffe027e533b1bcc0dbf270532e48285 /doc/lispref/nonascii.texi
parent4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff)
parent810fa21d26453f898de9747ece7205dfe6de9d08 (diff)
downloademacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz
emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2
emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'doc/lispref/nonascii.texi')
-rw-r--r--doc/lispref/nonascii.texi6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index c22930d624e..6980920a7b9 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -459,7 +459,7 @@ of character properties. In particular, Emacs supports the
@uref{https://www.unicode.org/reports/tr23/, Unicode Character Property
Model}, and the Emacs character property database is derived from the
Unicode Character Database (@acronym{UCD}). See the
-@uref{https://www.unicode.org/versions/Unicode12.1.0/ch04.pdf, Character
+@uref{https://www.unicode.org/versions/Unicode14.0.0/ch04.pdf, Character
Properties chapter of the Unicode Standard}, for a detailed
description of Unicode character properties and their meaning. This
section assumes you are already familiar with that chapter of the
@@ -1988,7 +1988,9 @@ for decoding keyboard input from @var{terminal}. If
@var{coding-system} is @code{nil}, that means not to decode keyboard
input. If @var{terminal} is a frame, it means that frame's terminal;
if it is @code{nil}, that means the currently selected frame's
-terminal. @xref{Multiple Terminals}.
+terminal. @xref{Multiple Terminals}. Note that on modern MS-Windows
+systems Emacs always uses Unicode input when decoding keyboard input,
+so the encoding set by this command has no effect on Windows.
@end deffn
@defun terminal-coding-system &optional terminal