From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 6 Nov 2001 15:07:31 +0000 (+0000)
Subject: (make_lispy_event): Check integerness and fix Lisp_Object/int mixup.
X-Git-Tag: ttn-vms-21-2-B4~18783
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a6a97d7b9e970e757c1a9c96412ca351207ea0c;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index da2e7ffaa27..ddf6680a01d 100644
--- 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,Bm(Bk  <Pavel@Janik.cz>
 
 	* fns.c (copy_hash_table): Remove unused variable `v'.
diff --git a/src/keyboard.c b/src/keyboard.c
index ff430fddde7..2aa4b51ccf3 100644
--- 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