Mercurial > emacs
comparison src/xterm.c @ 89383:b93d02d6a69e
(XTread_socket): Check Lisp types for Vx_keysym_table
and fix C types.
author | Dave Love <fx@gnu.org> |
---|---|
date | Tue, 04 Feb 2003 19:24:26 +0000 |
parents | e29bc0557851 |
children | 2f877ed80fa6 |
comparison
equal
deleted
inserted
replaced
89382:c25cbf7ce916 | 89383:b93d02d6a69e |
---|---|
10569 bufp++; | 10569 bufp++; |
10570 count++; | 10570 count++; |
10571 numchars--; | 10571 numchars--; |
10572 } | 10572 } |
10573 /* Now non-ASCII. */ | 10573 /* Now non-ASCII. */ |
10574 else if (! EQ ((c = Fgethash (make_number (keysym), | 10574 else if (HASH_TABLE_P (Vx_keysym_table) |
10575 Vx_keysym_table, Qnil)), | 10575 && (CHARACTERP (c = Fgethash (make_number (keysym), |
10576 Qnil)) | 10576 Vx_keysym_table, |
10577 Qnil)))) | |
10577 { | 10578 { |
10578 bufp->kind = (ASCII_CHAR_P (c) | 10579 bufp->kind = (ASCII_CHAR_P (XFASTINT (c)) |
10579 ? ascii_keystroke | 10580 ? ascii_keystroke |
10580 : multibyte_char_keystroke); | 10581 : multibyte_char_keystroke); |
10581 bufp->code = c; | 10582 bufp->code = XFASTINT (c); |
10582 XSETFRAME (bufp->frame_or_window, f); | 10583 XSETFRAME (bufp->frame_or_window, f); |
10583 bufp->arg = Qnil; | 10584 bufp->arg = Qnil; |
10584 bufp->modifiers | 10585 bufp->modifiers |
10585 = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), | 10586 = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), |
10586 modifiers); | 10587 modifiers); |