--- rxvt-unicode/src/screen.C	2006/01/19 16:22:13	1.238
+++ rxvt-unicode/src/screen.C	2006/01/19 19:51:08	1.242
@@ -236,7 +236,6 @@
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      CLEAR_ALL_SELECTION ();
       rvideo = 0;
     }
   else
@@ -327,6 +326,10 @@
 
                   int qcol = 0;
 
+                  // see below for cursor adjustment rationale
+                  if (p == ocur.row)
+                    screen.cur.row = q - (total_rows - nrow);
+                  
                   // fill a single destination line
                   while (lofs < llen && qcol < ncol)
                     {
@@ -346,8 +349,10 @@
 
                       int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
 
+#if DEBUG_STRICT
                       assert (len);
                       assert (pline.t);
+#endif
 
                       memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
                       memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
@@ -391,11 +396,6 @@
           term_start = 0;
         }
 
-#ifdef DEBUG_STRICT //TODO: remove
-      for (int i = top_row; i < nrow; i++)
-        assert (ROW (i).t);
-#endif
-
       free (old_buf);
       delete old_ta;
       delete old_ra;
@@ -407,6 +407,8 @@
         free (tabs);
     }
 
+  CLEAR_ALL_SELECTION ();
+
   prev_nrow = nrow;
   prev_ncol = ncol;
 
@@ -462,7 +464,7 @@
  * XTERM_SEQ: Restore cursor: ESC 8
  */
 void
-rxvt_term::scr_cursor (int mode)
+rxvt_term::scr_cursor (cursor_mode mode)
 {
   screen_t *s;