Commit 2f2c059d authored by Dave Love's avatar Dave Love

(XTread_socket): Check Lisp types for Vx_keysym_table

and fix C types.
parent a82f9242
......@@ -10571,14 +10571,15 @@ XTread_socket (sd, bufp, numchars, expected)
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment