--- rxvt-unicode/src/screen.C	2008/11/05 14:43:54	1.327
+++ rxvt-unicode/src/screen.C	2010/01/06 17:52:43	1.331
@@ -288,9 +288,7 @@
           do
             {
               p = MOD (p - 1, prev_total_rows);
-#ifdef DEBUG_STRICT
               assert (old_buf [MOD (p, prev_total_rows)].t);
-#endif
               int plines = 1;
               int llen = old_buf [MOD (p, prev_total_rows)].l;
 
@@ -512,10 +510,8 @@
   /* boundary check in case screen size changed between SAVE and RESTORE */
   min_it (s->cur.row, nrow - 1);
   min_it (s->cur.col, ncol - 1);
-#ifdef DEBUG_STRICT
   assert (s->cur.row >= 0);
   assert (s->cur.col >= 0);
-#endif
 }
 
 void
@@ -785,11 +781,9 @@
         }
     }
 
-#ifdef DEBUG_STRICT
   assert (screen.cur.col < ncol);
   assert (screen.cur.row < nrow
           && screen.cur.row >= top_row);
-#endif
   int row = screen.cur.row;
 
   checksel = selection.op && current_screen == selection.screen ? 1 : 0;
@@ -1003,9 +997,7 @@
 
   max_it (line->l, screen.cur.col);
 
-#ifdef DEBUG_STRICT
   assert (screen.cur.row >= 0);
-#endif
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1943,6 +1935,7 @@
     }
   else
     XBell (dpy, 0);
+  HOOK_INVOKE ((this, HOOK_BELL, DT_END));
 #endif
 }
 
@@ -1971,7 +1964,7 @@
 
   wctomb (0, 0);
 
-  for (int r1 = 0; r1 < nrows; r1++)
+  for (int r1 = row_start; r1 < row_start + nrows; r1++)
     {
       text_t *tp = ROW(r1).t;
       int len    = ROW(r1).l;
@@ -2252,7 +2245,8 @@
               if (stp[col] == NOCHAR)
                 {
                   dtp[col] = stp[col];
-                  drp[col] = rend;
+                  drp[col] = srp[col];
+
                   count++;
                   i++;