--- rxvt-unicode/src/screen.C	2005/12/22 19:25:58	1.192
+++ rxvt-unicode/src/screen.C	2005/12/26 21:30:04	1.194
@@ -387,7 +387,7 @@
           term_start = 0;
         }
 
-#ifdef DEBUG_STRICT
+#ifdef DEBUG_STRICT //TODO: remove
       for (int i = -nsaved; i < nrow; i++)
         assert (ROW (i).t);
 #endif
@@ -622,7 +622,13 @@
           selection.end.row  -= count;
           selection.mark.row -= count;
 
-          selection_check (0);
+          if (selection.beg.row < -nsaved
+              || selection.end.row < -nsaved
+              || selection.mark.row < -nsaved)
+            {
+              CLEAR_ALL_SELECTION ();
+              selection.op = SELECTION_CLEAR;
+            }
         }
 
       for (int i = count; i--; )
@@ -637,20 +643,17 @@
     {
       if (selection.op && current_screen == selection.screen)
         {
-          int i = selection.beg.row;
-          int j = selection.end.row;
-
-          if ((i < row1 && j > row1)
-              || (i < row2 && j > row2)
-              || (i - count < row1 && i >= row1)
-              || (i - count > row2 && i <= row2)
-              || (j - count < row1 && j >= row1)
-              || (j - count > row2 && j <= row2))
+          if ((selection.beg.row < row1 && selection.end.row > row1)
+              || (selection.beg.row < row2 && selection.end.row > row2)
+              || (selection.beg.row - count < row1 && selection.beg.row >= row1)
+              || (selection.beg.row - count > row2 && selection.beg.row <= row2)
+              || (selection.end.row - count < row1 && selection.end.row >= row1)
+              || (selection.end.row - count > row2 && selection.end.row <= row2))
             {
               CLEAR_ALL_SELECTION ();
-              selection.op = SELECTION_CLEAR;  /* XXX: too aggressive? */
+              selection.op = SELECTION_CLEAR;
             }
-          else if (j >= row1 && j <= row2)
+          else if (selection.end.row >= row1 && selection.end.row <= row2)
             {
               /* move selected region too */
               selection.beg.row  -= count;
@@ -695,7 +698,7 @@
 
   unsigned char checksel;
   unicode_t c;
-  int row, last_col;
+  int last_col;
   const unicode_t *strend = str + len;
 
   want_refresh = 1;
@@ -720,7 +723,7 @@
   assert (screen.cur.row < nrow
           && screen.cur.row >= -nsaved);
 #endif
-  row = screen.cur.row;
+  int row = screen.cur.row;
 
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
 
@@ -987,9 +990,7 @@
     return;
   else if (count > 0)
     {
-      int row = screen.cur.row;
-
-      line_t &l = ROW(row);
+      line_t &l = ROW(screen.cur.row);
       rend_t base_rend = l.r[i];
       ht &= l.t[i] == ' ';
 
@@ -1074,16 +1075,12 @@
 void
 rxvt_term::scr_forwardindex ()
 {
-  int row;
-
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
     {
-      row = screen.cur.row;
-
-      if (ROW(row).is_longer ()) //TODO//FIXME//LEN
-        ROW(row).l = ncol;
+      if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
+        ROW(screen.cur.row).l = ncol;
 
       scr_gotorc (0, 0, R_RELATIVE);
       scr_insdel_chars (1, DELETE);
@@ -1176,21 +1173,21 @@
 void
 rxvt_term::scr_erase_line (int mode)
 {
-  unsigned int row, col, num;
+  unsigned int col, num;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
   selection_check (1);
 
-  row = screen.cur.row;
+  line_t &line = ROW(screen.cur.row);
 
   switch (mode)
     {
       case 0:                     /* erase to end of line */
         col = screen.cur.col;
         num = ncol - col;
-        min_it (ROW(row).l, col);
+        min_it (line.l, col);
         if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
             || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
           CLEAR_SELECTION ();
@@ -1205,7 +1202,7 @@
       case 2:                     /* erase whole line */
         col = 0;
         num = ncol;
-        ROW(row).l = 0;
+        line.l = 0;
         if (selection.beg.row <= screen.cur.row
             && selection.end.row >= screen.cur.row)
           CLEAR_SELECTION ();
@@ -1214,7 +1211,7 @@
         return;
     }
 
-  scr_blank_line (ROW(row), col, num, rstyle);
+  scr_blank_line (line, col, num, rstyle);
 }
 
 /* ------------------------------------------------------------------------- */