changeset 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 c25cbf7ce916
children 02430d914fc1
files src/xterm.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Fri Jan 31 06:11:29 2003 +0000
+++ b/src/xterm.c	Tue Feb 04 19:24:26 2003 +0000
@@ -10571,14 +10571,15 @@
 			  numchars--;
 			}
 		      /* Now non-ASCII.  */
-		      else if (! EQ ((c = Fgethash (make_number (keysym),
-						    Vx_keysym_table, Qnil)),
-				     Qnil))
+		      else if (HASH_TABLE_P (Vx_keysym_table)
+			       && (CHARACTERP (c = Fgethash (make_number (keysym),
+							     Vx_keysym_table,
+							     Qnil))))
 			{
-			  bufp->kind = (ASCII_CHAR_P (c)
+			  bufp->kind = (ASCII_CHAR_P (XFASTINT (c))
 					? ascii_keystroke
 					: multibyte_char_keystroke);
-			  bufp->code = c;
+			  bufp->code = XFASTINT (c);
 			  XSETFRAME (bufp->frame_or_window, f);
 			  bufp->arg = Qnil;
 			  bufp->modifiers