[Emacs-diffs] Changes to emacs/src/keymap.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/09/11 08:52:42

Index: keymap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keymap.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- keymap.c    11 Sep 2006 02:34:05 -0000      1.331
+++ keymap.c    11 Sep 2006 08:52:42 -0000      1.332
@@ -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,