emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/src/keymap.c,v
Date: Tue, 19 Sep 2006 10:19:35 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/09/19 10:19:34

Index: keymap.c
===================================================================
RCS file: /sources/emacs/emacs/src/keymap.c,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -b -r1.334 -r1.335
--- keymap.c    15 Sep 2006 07:19:14 -0000      1.334
+++ keymap.c    19 Sep 2006 10:19:34 -0000      1.335
@@ -23,6 +23,9 @@
 
 #include <config.h>
 #include <stdio.h>
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"
@@ -1595,15 +1598,12 @@
 
   GCPRO2 (key, position);
 
-  if (NILP (position))
+  if (NILP (position) && VECTORP (key))
     {
-      Lisp_Object event;
+      Lisp_Object event
       /* mouse events may have a symbolic prefix indicating the
         scrollbar or mode line */
-      if (SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1)
-       event = AREF (key, 1);
-      else
-       event = AREF (key, 0);
+       = AREF (key, SYMBOLP (AREF (key, 0)) && ASIZE (key) > 1 ? 1 : 0);
 
       /* We are not interested in locations without event data */
 
@@ -1672,9 +1672,7 @@
 
       if (CONSP (position))
        {
-         Lisp_Object string, window;
-
-         window = POSN_WINDOW (position);
+         Lisp_Object string;
 
          /* For a mouse click, get the local text-property keymap
             of the place clicked on, rather than point.  */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]