(make_lispy_event): Check integerness and fix Lisp_Object/int mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index da2e7ffaa274613748b29f86efa7ac8479a6dbec..ddf6680a01d94284b37cdaa70c1845b08ceb8fc3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-06  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * keyboard.c (make_lispy_event): Check integerness and fix
+       Lisp_Object/int mixup.
+
 2001-11-06  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * fns.c (copy_hash_table): Remove unused variable `v'.

diff --git a/src/keyboard.c b/src/keyboard.c
index ff430fddde7db978217f71042cd41e1f57a6bcfe..2aa4b51ccf3685000719d976ed64f5371aa4f92e 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4996,10 +4996,11 @@ make_lispy_event (event)
                /* The third element of every position
                   should be the (x,y) pair.  */
                down = Fcar (Fcdr (Fcdr (start_pos)));
-               if (CONSP (down))
+               if (CONSP (down)
+                   && INTEGERP (XCAR (down)) && INTEGERP (XCDR (down)))
                  {
-                   xdiff = event->x - XCAR (down);
-                   ydiff = event->y - XCDR (down);
+                   xdiff = XFASTINT (event->x) - XFASTINT (XCAR (down));
+                   ydiff = XFASTINT (event->y) - XFASTINT (XCDR (down));
                  }
 
                if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz