2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c5ac065b132..d6a7624de20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-04  Kim F. Storm  <storm@cua.dk>
 
+        * xdisp.c (define_frame_cursor1): Do not change frame cursor
+        while tracking/dragging mouse.
+        (x_draw_vertical_border): Do not draw line if frame has scroll bars.
+
         * window.c (coordinates_in_window): Relax check for cursor
         on vertial border between mode lines.
         (Fset_window_fringes): Do not allow negative widths.
diff --git a/src/xdisp.c b/src/xdisp.c
index ddd247b3430..82fa97c5190 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -215,6 +215,8 @@ extern int pending_menu_activation;
 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;
 
@@ -20764,6 +20766,10 @@ define_frame_cursor1 (f, cursor, pointer)
      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))