--- a/src/redisplay-output.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/redisplay-output.c	Mon Aug 13 09:02:59 2007 +0200
@@ -333,23 +333,13 @@
      full redraw of the block in order to make sure that the cursor is
      updated properly. */
   if (ddb->type != TEXT
-#if 0
-      /* I'm not sure exactly what this code wants to do, but it's
-       * not right--it doesn't update when cursor_elt changes from, e.g.,
-       * 0 to 8, and the new or old cursor loc overlaps this block.
-       * I've replaced it with the more conservative test below.
-       * -dkindred@cs.cmu.edu 23-Mar-1997 */
       && ((cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
 	  || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1))
       && (ddl->cursor_elt == -1 ||
 	  (cursor_start
 	   && cursor_width
 	   && (cursor_start + cursor_width) >= start_pixpos
-	   && cursor_start <= block_end))
-#else
-      && (cdl->cursor_elt != ddl->cursor_elt)
-#endif
-      )
+	   && cursor_start <= block_end)))
     force = 1;
 
   if (f->windows_structure_changed ||
@@ -1150,12 +1140,7 @@
   /* #### See if we can get away with only calling this if
      max_line_len is greater than the window_char_width. */
 #ifdef HAVE_SCROLLBARS
-  {
-    extern int stupid_vertical_scrollbar_drag_hack;
-
-    update_window_scrollbars (w, NULL, 1, stupid_vertical_scrollbar_drag_hack);
-    stupid_vertical_scrollbar_drag_hack = 1;
-  }
+  update_window_scrollbars (w, NULL, 1, 1);
 #endif
 
   /* This has to be done after we've updated the values.  We don't