Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-650
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-651
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-652
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-653
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-654
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-655
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-656
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-657
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-658
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-659
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-203
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-204
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-205
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599

1 files changed, 2 insertions, 2 deletions

diff --git a/src/keymap.c b/src/keymap.c
index c85c37aae12..0f1e922969c 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1605,10 +1605,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);
         }
     }