From: David Kastrup <dak@gnu.org>
Date: Fri, 2 Mar 2007 08:45:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.96~312
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9b263874cb7889e955eec5c26b5b5f9094ac4ab;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index afb6ce8b7b3..d9633301be2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-02  Stuart D. Herring <herring@lanl.gov>
+
+	* keymap.c (Fkey_binding): Don't consider two-element lists as
+	events.
+
 2007-03-01  Kenichi Handa  <handa@m17n.org>
 
 	* process.c (send_process_object): Check the process status and
diff --git a/src/keymap.c b/src/keymap.c
index 6b4b8536fe1..dd126a9a8f3 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1612,10 +1612,10 @@ specified buffer position instead of point are used.
 
       /* We are not interested in locations without event data */
 
-      if (EVENT_HAS_PARAMETERS (event))
+      if (EVENT_HAS_PARAMETERS (event) && CONSP (XCDR (event)))
 	{
 	  Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
-	  if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
+	  if (EQ (kind, Qmouse_click))
 	    position = EVENT_START (event);
 	}
     }