diff options
| author | Joakim Verona | 2013-09-12 16:37:18 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 16:37:18 +0200 |
| commit | 207a6ffd668f371fb2deb948e21f28d39d698596 (patch) | |
| tree | 52a6b07795890fd2a4eee6efba4d436e22f3d792 | |
| parent | 9e85e5849326ef68f54e7d21abc2bf898c158a37 (diff) | |
| parent | 4dfa4b9bd944fa385b248b5b0b56e95979119420 (diff) | |
| download | emacs-207a6ffd668f371fb2deb948e21f28d39d698596.tar.gz emacs-207a6ffd668f371fb2deb948e21f28d39d698596.zip | |
merge from trunk
| -rw-r--r-- | doc/lispref/nonascii.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 64c0033847c..e8e810ce61f 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi | |||
| @@ -686,6 +686,7 @@ which case the returned charset must be supported by that coding | |||
| 686 | system (@pxref{Coding Systems}). | 686 | system (@pxref{Coding Systems}). |
| 687 | @end defun | 687 | @end defun |
| 688 | 688 | ||
| 689 | @c TODO: Explain the properties here and add indexes such as ‘charset property’. | ||
| 689 | @defun charset-plist charset | 690 | @defun charset-plist charset |
| 690 | This function returns the property list of the character set | 691 | This function returns the property list of the character set |
| 691 | @var{charset}. Although @var{charset} is a symbol, this is not the | 692 | @var{charset}. Although @var{charset} is a symbol, this is not the |
| @@ -851,6 +852,8 @@ systems specifies its own translation tables, the table that is the | |||
| 851 | value of this variable, if non-@code{nil}, is applied after them. | 852 | value of this variable, if non-@code{nil}, is applied after them. |
| 852 | @end defvar | 853 | @end defvar |
| 853 | 854 | ||
| 855 | @c FIXME: This variable is obsolete since 23.1. We should mention | ||
| 856 | @c that here or simply remove this defvar. --xfq | ||
| 854 | @defvar translation-table-for-input | 857 | @defvar translation-table-for-input |
| 855 | Self-inserting characters are translated through this translation | 858 | Self-inserting characters are translated through this translation |
| 856 | table before they are inserted. Search commands also translate their | 859 | table before they are inserted. Search commands also translate their |