Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 653-661)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 203-206)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180

1 files changed, 2 insertions, 2 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 671801fa1ba..abf934908cc 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1645,10 +1645,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);
         }
     }