diff src/keyboard.c @ 83383:2a679c81f552

Merged from [e-mail]--gnu-2005 (patch 118-132, 551-577) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-551 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-552 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-553 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-554 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-555 Remove CVS keywords from newsticker files * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-556 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-557 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-558 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-559 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-560 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-561 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-562 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-563 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-564 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-565 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-566 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-567 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-568 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-569 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-570 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-571 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-572 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-573 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-574 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-575 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-576 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-577 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-118 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-119 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-120 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-121 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-122 Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-123 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-124 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-125 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-126 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-127 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-128 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-129 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-130 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-131 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-132 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-423

--- a/src/keyboard.c	Mon Sep 19 21:25:51 2005 +0000
+++ b/src/keyboard.c	Sun Oct 09 20:00:17 2005 +0000
@@ -464,10 +464,6 @@
 /* Nonzero if input is available.  */
 int input_pending;
 
-/* Non-zero means force key bindings update in parse_menu_item.  */
-
-int update_menu_bindings;
-
 extern char *pending_malloc_warning;
 
 /* Circular buffer for pre-read keyboard input.  */
@@ -5565,13 +5561,23 @@
 		if (CONSP (down)
 		    && INTEGERP (XCAR (down)) && INTEGERP (XCDR (down)))
 		  {
-		    xdiff = XFASTINT (event->x) - XFASTINT (XCAR (down));
-		    ydiff = XFASTINT (event->y) - XFASTINT (XCDR (down));
+		    xdiff = XINT (event->x) - XINT (XCAR (down));
+		    ydiff = XINT (event->y) - XINT (XCDR (down));
 		  }
 
 		if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz
-		    && ydiff < double_click_fuzz
-		    && ydiff > - double_click_fuzz)
+		    && ydiff < double_click_fuzz && ydiff > - double_click_fuzz
+		  /* Maybe the mouse has moved a lot, caused scrolling, and
+		     eventually ended up at the same screen position (but
+		     not buffer position) in which case it is a drag, not
+		     a click.  */
+		    /* FIXME: OTOH if the buffer position has changed
+		       because of a timer or process filter rather than
+		       because of mouse movement, it should be considered as
+		       a click.  But mouse-drag-region completely ignores
+		       this case and it hasn't caused any real problem, so
+		       it's probably OK to ignore it as well.  */
+		    && EQ (Fcar (Fcdr (start_pos)), Fcar (Fcdr (position))))
 		  /* Mouse hasn't moved (much).  */
 		  event->modifiers |= click_modifier;
 		else
@@ -7528,9 +7534,7 @@
       else
 	def = AREF (item_properties, ITEM_PROPERTY_DEF);
 
-      if (!update_menu_bindings)
-	chkcache = 0;
-      else if (NILP (XCAR (cachelist))) /* Have no saved key.  */
+      if (NILP (XCAR (cachelist))) /* Have no saved key.  */
 	{
 	  if (newcache		/* Always check first time.  */
 	      /* Should we check everything when precomputing key
@@ -10946,11 +10950,6 @@
   poll_suppress_count = 1;
   start_polling ();
 #endif
-
-#ifdef MAC_OSX
-  /* At least provide an escape route since C-g doesn't work.  */
-  signal (SIGINT, interrupt_signal);
-#endif
 }
 
 /* This type's only use is in syms_of_keyboard, to initialize the
@@ -11675,12 +11674,6 @@
 `disable-point-adjustment' (which see) to non-nil.  */);
   Vglobal_disable_point_adjustment = Qnil;
 
-  DEFVAR_BOOL ("update-menu-bindings", &update_menu_bindings,
-	       doc: /* Non-nil means updating menu bindings is allowed.
-A value of nil means menu bindings should not be updated.
-Used during Emacs' startup.  */);
-  update_menu_bindings = 1;
-
   DEFVAR_LISP ("minibuffer-message-timeout", &Vminibuffer_message_timeout,
 	       doc: /* *How long to display an echo-area message when the minibuffer is active.
 If the value is not a number, such messages don't time out.  */);