summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/keyboard.c12
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7bf6f118885..758118e3236 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2004-07-06 Luc Teirlinck <teirllm@auburn.edu>
+ * keyboard.c (syms_of_keyboard): Fix `keyboard-translate-table'
+ docstring.
+
* fns.c (Fclear_string): Declare `len' before call to CHECK_STRING.
2004-07-06 John Paul Wallington <jpw@gnu.org>
diff --git a/src/keyboard.c b/src/keyboard.c
index 9b36e96b70d..f016a1283e4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11151,11 +11151,13 @@ Useful to set before you dump a modified Emacs. */);
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'. */);