diff src/keyboard.c @ 83171:09bbf2fc80da

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-439 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-440 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-441 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-442 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-443 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-444 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-445 Tweak permissions * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-446 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-211

--- a/src/keyboard.c	Mon Jul 05 01:15:41 2004 +0000
+++ b/src/keyboard.c	Sat Jul 10 14:37:36 2004 +0000
@@ -11285,11 +11285,13 @@
 
   DEFVAR_LISP ("keyboard-translate-table", &Vkeyboard_translate_table,
 	       doc: /* Translate table for keyboard input, or nil.
-Each character is looked up in this string and the contents used instead.
-The value may be a string, a vector, or a char-table.
-If it is a string or vector of length N,
-character codes N and up are untranslated.
-In a vector or a char-table, an element which is nil means "no translation".
+If non-nil, the value should be a char-table.  Each character read
+from the keyboard is looked up in this char-table.  If the value found
+there is non-nil, then it is used instead of the actual input character.
+
+The value can also be a string or vector, but this is considered obsolete.
+If it is a string or vector of length N, character codes N and up are left
+untranslated.  In a vector, an element which is nil means "no translation".
 
 This is applied to the characters supplied to input methods, not their
 output.  See also `translation-table-for-input'.  */);