--- rxvt-unicode/src/screen.C	2005/12/22 18:36:55	1.191
+++ rxvt-unicode/src/screen.C	2005/12/22 19:39:29	1.193
@@ -285,7 +285,7 @@
           row_col_t ocur = screen.cur;
           ocur.row = MOD (term_start + ocur.row, prev_total_rows);
 
-          while (p != pend && q > 0)
+          do
             {
               p = MOD (p - 1, prev_total_rows);
 #ifdef DEBUG_STRICT
@@ -356,9 +356,9 @@
               qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
               scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
+          while (p != pend && q > 0);
 
           term_start = total_rows - nrow;
-          view_start = 0;
           nsaved = term_start - q;
  
           // make sure all terminal lines exist
@@ -385,10 +385,9 @@
             }
 
           term_start = 0;
-          view_start = 0;
         }
 
-#ifdef DEBUG_STRICT
+#ifdef DEBUG_STRICT //TODO: remove
       for (int i = -nsaved; i < nrow; i++)
         assert (ROW (i).t);
 #endif
@@ -696,7 +695,7 @@
 
   unsigned char checksel;
   unicode_t c;
-  int row, last_col;
+  int last_col;
   const unicode_t *strend = str + len;
 
   want_refresh = 1;
@@ -721,7 +720,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;
 
@@ -988,9 +987,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] == ' ';
 
@@ -1075,16 +1072,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);
@@ -1177,21 +1170,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 ();
@@ -1206,7 +1199,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 ();
@@ -1215,7 +1208,7 @@
         return;
     }
 
-  scr_blank_line (ROW(row), col, num, rstyle);
+  scr_blank_line (line, col, num, rstyle);
 }
 
 /* ------------------------------------------------------------------------- */