Mercurial > emacs

changeset 72803:93843380f78b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fkey_binding): Fix last change.
author Kim F. Storm <storm@cua.dk>
date Mon, 11 Sep 2006 08:52:42 +0000
parents b1d4304c3c6c
children 939f0ad90003
files src/keymap.c
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/keymap.c	Mon Sep 11 08:52:33 2006 +0000
+++ b/src/keymap.c	Mon Sep 11 08:52:42 2006 +0000
@@ -1577,16 +1577,17 @@
   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))))
+  if (VECTORP (key) && ASIZE (key) > 0)
     {
-      Lisp_Object map, obj, pos = XCAR (XCDR (AREF (key, 0)));
-
-      if (XINT (Flength (pos)) == 10 && INTEGERP (XCAR (XCDR (pos))))
+      Lisp_Object ev, pos;
+      if ((ev = AREF (key, 0), CONSP (ev))
+	  && SYMBOLP (XCAR (ev))
+	  && CONSP (XCDR (ev))
+	  && (pos = XCAR (XCDR (ev)), CONSP (pos))
+	  && XINT (Flength (pos)) == 10
+	  && INTEGERP (XCAR (XCDR (pos))))
 	{
+	  Lisp_Object map, obj;
 	  obj = Fnth (make_number(4), pos);
 	  map = Fget_char_property (XCAR (XCDR (pos)),
 				    Qkeymap,