diff options
| author | Dave Love <fx@gnu.org> | 2002-11-04 14:58:44 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2002-11-04 14:58:44 +0000 |
| commit | 5e3cb80dac8af47d279f2c940c31355421747f08 (patch) | |
| tree | 3611df72eae41b868f340e6f1568d135ef63b366 /src | |
| parent | f7706646eb22dbf8819b0071e94fdeb2ce53dbea (diff) | |
| download | emacs-5e3cb80dac8af47d279f2c940c31355421747f08.tar.gz | |
(read_char): Always translate iff
Vkeyboard_translate_table is a char table and c is valid.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f3e2f01f6d1..30af0289369 100644 --- 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 7e3e4372e51..ea1f82f5639 100644 --- 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); |