Mercurial > emacs
changeset 88379:bedac2738d2c
Include "character.h" instead of "charset.h".
(command_loop_1): Never call direct_output_forward_char before
a non-ASCII character.
(read_char): If Vkeyboard_translate_table is a char table, always
translated a character.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 01 Mar 2002 01:43:03 +0000 |
| parents | 46d69e409b5b |
| children | 88a2dd2ddb6e |
| files | src/keyboard.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Fri Mar 01 01:42:42 2002 +0000 +++ b/src/keyboard.c Fri Mar 01 01:43:03 2002 +0000 @@ -32,7 +32,7 @@ #include "window.h" #include "commands.h" #include "buffer.h" -#include "charset.h" +#include "character.h" #include "disptab.h" #include "dispextern.h" #include "syntax.h" @@ -1553,7 +1553,7 @@ : (lose >= 0x20 && lose < 0x7f)) /* To extract the case of continuation on wide-column characters. */ - && (WIDTH_BY_CHAR_HEAD (FETCH_BYTE (PT_BYTE)) == 1) + && ASCII_BYTE_P (lose) && (XFASTINT (XWINDOW (selected_window)->last_modified) >= MODIFF) && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified) @@ -2699,8 +2699,7 @@ && XSTRING (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c)) || (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_TABLE_P (Vkeyboard_translate_table)) { Lisp_Object d; d = Faref (Vkeyboard_translate_table, c);