Mercurial > emacs

comparison src/keyboard.c @ 88379:bedac2738d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d42084cd7d73
children d8ddbdfc33da
comparison
equal deleted inserted replaced
88378:46d69e409b5b 88379:bedac2738d2c
30 #include "keyboard.h" 30 #include "keyboard.h"
31 #include "frame.h" 31 #include "frame.h"
32 #include "window.h" 32 #include "window.h"
33 #include "commands.h" 33 #include "commands.h"
34 #include "buffer.h" 34 #include "buffer.h"
35 #include "charset.h" 35 #include "character.h"
36 #include "disptab.h" 36 #include "disptab.h"
37 #include "dispextern.h" 37 #include "dispextern.h"
38 #include "syntax.h" 38 #include "syntax.h"
39 #include "intervals.h" 39 #include "intervals.h"
40 #include "keymap.h" 40 #include "keymap.h"
1551 : (NILP (DISP_CHAR_VECTOR (dp, lose)) 1551 : (NILP (DISP_CHAR_VECTOR (dp, lose))
1552 && (lose >= 0x20 && lose < 0x7f))) 1552 && (lose >= 0x20 && lose < 0x7f)))
1553 : (lose >= 0x20 && lose < 0x7f)) 1553 : (lose >= 0x20 && lose < 0x7f))
1554 /* To extract the case of continuation on 1554 /* To extract the case of continuation on
1555 wide-column characters. */ 1555 wide-column characters. */
1556 && (WIDTH_BY_CHAR_HEAD (FETCH_BYTE (PT_BYTE)) == 1) 1556 && ASCII_BYTE_P (lose)
1557 && (XFASTINT (XWINDOW (selected_window)->last_modified) 1557 && (XFASTINT (XWINDOW (selected_window)->last_modified)
1558 >= MODIFF) 1558 >= MODIFF)
1559 && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified) 1559 && (XFASTINT (XWINDOW (selected_window)->last_overlay_modified)
1560 >= OVERLAY_MODIFF) 1560 >= OVERLAY_MODIFF)
1561 && (XFASTINT (XWINDOW (selected_window)->last_point) 1561 && (XFASTINT (XWINDOW (selected_window)->last_point)
2697 2697
2698 if ((STRINGP (Vkeyboard_translate_table) 2698 if ((STRINGP (Vkeyboard_translate_table)
2699 && XSTRING (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c)) 2699 && XSTRING (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c))
2700 || (VECTORP (Vkeyboard_translate_table) 2700 || (VECTORP (Vkeyboard_translate_table)
2701 && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c)) 2701 && XVECTOR (Vkeyboard_translate_table)->size > (unsigned) XFASTINT (c))
2702 || (CHAR_TABLE_P (Vkeyboard_translate_table) 2702 || CHAR_TABLE_P (Vkeyboard_translate_table))
2703 && CHAR_TABLE_ORDINARY_SLOTS > (unsigned) XFASTINT (c)))
2704 { 2703 {
2705 Lisp_Object d; 2704 Lisp_Object d;
2706 d = Faref (Vkeyboard_translate_table, c); 2705 d = Faref (Vkeyboard_translate_table, c);
2707 /* nil in keyboard-translate-table means no translation. */ 2706 /* nil in keyboard-translate-table means no translation. */
2708 if (!NILP (d)) 2707 if (!NILP (d))