diff src/xdisp.c @ 83213:d83f49cefda3

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-593 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-594 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-595 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-596 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-597 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-598 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-599 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-600 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-601 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-602 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-603 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-42 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-43 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-44 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-253

--- a/src/xdisp.c	Sun Oct 03 13:08:55 2004 +0000
+++ b/src/xdisp.c	Thu Oct 07 16:52:19 2004 +0000
@@ -215,6 +215,8 @@
 extern int interrupt_input;
 extern int command_loop_level;
 
+extern Lisp_Object do_mouse_tracking;
+
 extern int minibuffer_auto_raise;
 extern Lisp_Object Vminibuffer_list;
 
@@ -20762,6 +20764,10 @@
      Cursor cursor;
      Lisp_Object pointer;
 {
+  /* Do not change cursor shape while dragging mouse.  */
+  if (!NILP (do_mouse_tracking))
+    return;
+
   if (!NILP (pointer))
     {
       if (EQ (pointer, Qarrow))
@@ -21625,6 +21631,9 @@
      do it for frames with vertical scroll bars because either the
      right scroll bar of a window, or the left scroll bar of its
      neighbor will suffice as a border.  */
+  if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
+    return;
+
   if (!WINDOW_RIGHTMOST_P (w)
       && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     {