* keymap.c (Fkey_binding): Check for local keymap for mouse click

	events.

2 files changed, 32 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2bc50904caa..a2fa51db1b2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * keymap.c (Fkey_binding): Check for local keymap for mouse click
+        events.
+
 2006-09-10  Kim F. Storm  <storm@cua.dk>
 
         * keyboard.c (Finput_pending_p): Check Vunread_input_method_events
diff --git a/src/keymap.c b/src/keymap.c
index 4871179c420..1d854f77b4c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1576,6 +1576,33 @@ is non-nil, `key-binding' returns the unmapped command.  */)
 
   GCPRO1 (key);
 
+#ifdef HAVE_MOUSE
+  if (VECTORP (key)
+      && ASIZE (key) > 0
+      && CONSP (AREF (key, 0))
+      && SYMBOLP (XCAR (AREF (key, 0)))
+      && CONSP (XCDR (AREF (key, 0))))
+    {
+      Lisp_Object map, obj, pos = XCAR (XCDR (AREF (key, 0)));
+
+      if (XINT (Flength (pos)) == 10 && INTEGERP (XCAR (XCDR (pos))))
+        {
+          obj = Fnth (make_number(4), pos);
+          map = Fget_char_property (XCAR (XCDR (pos)),
+                                    Qkeymap,
+                                    NILP (obj) ?
+                                    Fwindow_buffer (XCAR (pos))
+                                    : XCAR (obj));
+          if (!NILP (Fkeymapp (map)))
+            {
+              value = Flookup_key (map, key, accept_default);
+              if (! NILP (value) && !INTEGERP (value))
+                goto done;
+            }
+        }
+    }
+#endif /* HAVE_MOUSE  */
+
   if (!NILP (current_kboard->Voverriding_terminal_local_map))
     {
       value = Flookup_key (current_kboard->Voverriding_terminal_local_map,