# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1160703937 0
# Node ID 1a3368a808797225d93865f4cfaaa8dc80a715cf
# Parent  43ccf7c7d312bc9e47c09a5474edcf492ba58c48
	* keymap.c (Fkey_binding): Check Lisp_Object types before doing
	XCAR and XINT.

diff -r 43ccf7c7d312 -r 1a3368a80879 src/ChangeLog
--- a/src/ChangeLog	Fri Oct 13 01:41:11 2006 +0000
+++ b/src/ChangeLog	Fri Oct 13 01:45:37 2006 +0000
@@ -1,3 +1,8 @@
+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.
diff -r 43ccf7c7d312 -r 1a3368a80879 src/keymap.c
--- a/src/keymap.c	Fri Oct 13 01:41:11 2006 +0000
+++ b/src/keymap.c	Fri Oct 13 01:45:37 2006 +0000
@@ -1610,13 +1610,12 @@
 
       /* 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 @@
 	      
 	      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);