Commit eae637ec authored by Chong Yidong's avatar Chong Yidong
Browse files

* keymap.c (Fkey_binding): Check Lisp_Object types before doing

	XCAR and XINT.
parent d81608e0
2006-10-12 Chong Yidong <cyd@stupidchicken.com>
* keymap.c (Fkey_binding): Check Lisp_Object types before doing
XCAR and XINT.
2006-10-12 Romain Francoise <romain@orebokech.com>
 
* image.c (xbm_read_bitmap_data): Delete extra semicolon.
......
......@@ -1610,13 +1610,12 @@ specified buffer position instead of point are used.
/* We are not interested in locations without event data */
if (EVENT_HAS_PARAMETERS (event)) {
Lisp_Object kind;
kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
if (EQ (kind, Qmouse_click))
position = EVENT_START (event);
}
if (EVENT_HAS_PARAMETERS (event))
{
Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
position = EVENT_START (event);
}
}
/* Key sequences beginning with mouse clicks
......@@ -1709,7 +1708,8 @@ specified buffer position instead of point are used.
pos = XCDR (string);
string = XCAR (string);
if (XINT (pos) >= 0
if (INTEGERP (pos)
&& XINT (pos) >= 0
&& XINT (pos) < SCHARS (string))
{
map = Fget_text_property (pos, Qlocal_map, string);
......
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