aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-01-17 19:14:29 +0000
committerEli Zaretskii2009-01-17 19:14:29 +0000
commit3f1d322f586073fe6c284885a42d64503a2bc6c1 (patch)
tree4f3cd507e700c4fa48f5589a7faa501fd3c57438
parentd3ae77bcb9a3d5386da6206f8bae5818430f30dc (diff)
downloademacs-3f1d322f586073fe6c284885a42d64503a2bc6c1.tar.gz
emacs-3f1d322f586073fe6c284885a42d64503a2bc6c1.zip
(Terminal I/O Encoding): `keyboard-coding-system' and
`set-keyboard-coding-system' now accept an optional terminal argument.
-rw-r--r--doc/lispref/nonascii.texi18
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 2ac927d82c0..841277209f2 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1596,15 +1596,21 @@ display text using a particular encoding such as Latin-1. Emacs does
1596not set @code{last-coding-system-used} for encoding or decoding of 1596not set @code{last-coding-system-used} for encoding or decoding of
1597terminal I/O. 1597terminal I/O.
1598 1598
1599@defun keyboard-coding-system 1599@defun keyboard-coding-system &optional terminal
1600This function returns the coding system that is in use for decoding 1600This function returns the coding system that is in use for decoding
1601keyboard input---or @code{nil} if no coding system is to be used. 1601keyboard input from @var{terminal}---or @code{nil} if no coding system
1602is to be used for that terminal. If @var{terminal} is omitted or
1603@code{nil}, it means the selected frame's terminal. @xref{Multiple
1604Terminals}.
1602@end defun 1605@end defun
1603 1606
1604@deffn Command set-keyboard-coding-system coding-system 1607@deffn Command set-keyboard-coding-system coding-system &optional terminal
1605This command specifies @var{coding-system} as the coding system to 1608This command specifies @var{coding-system} as the coding system to use
1606use for decoding keyboard input. If @var{coding-system} is @code{nil}, 1609for decoding keyboard input from @var{terminal}. If
1607that means do not decode keyboard input. 1610@var{coding-system} is @code{nil}, that means do not decode keyboard
1611input. If @var{terminal} is a frame, it means that frame's terminal;
1612if it is @code{nil}, that means the currently selected frame's
1613terminal. @xref{Multiple Terminals}.
1608@end deffn 1614@end deffn
1609 1615
1610@defun terminal-coding-system 1616@defun terminal-coding-system