(read_char): Always translate iff

Vkeyboard_translate_table is a char table and c is valid.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3e2f01f6d12a6c8c14f655f7e8d6c99b335d318..30af028936963ba59910f0c5cf0fbbe759c4c211 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-04  Dave Love  <fx@gnu.org>
+
+       * keyboard.c (read_char): Always translate iff
+       Vkeyboard_translate_table is a char table and c is valid.
+
+       * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
+       and fix C types.
+
 2002-11-03  Stefan Monnier  <monnier@cs.yale.edu>
 
        * xdisp.c (single_display_prop_intangible_p): Strings are intangible.

diff --git a/src/keyboard.c b/src/keyboard.c
index 7e3e4372e51419be8edab750628b7a5d5ca4ddd4..ea1f82f56398f0d7c68a04bad9f9d9189c139bf8 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2780,7 +2780,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
          || (VECTORP (Vkeyboard_translate_table)
              && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c))
          || (CHAR_TABLE_P (Vkeyboard_translate_table)
-             && CHAR_TABLE_ORDINARY_SLOTS > (unsigned) XFASTINT (c)))
+             && CHAR_VALID_P (XINT (c), 0)))
        {
          Lisp_Object d;
          d = Faref (Vkeyboard_translate_table, c);