--- rxvt-unicode/src/screen.C	2011/11/16 18:52:17	1.407
+++ rxvt-unicode/src/screen.C	2012/01/09 21:12:08	1.411
@@ -1314,7 +1314,7 @@
 
 /* ------------------------------------------------------------------------- */
 /*
- * Erase part of whole of the screen
+ * Erase part or whole of the screen
  * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
  * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
  * XTERM_SEQ: Clear whole screen        : ESC [ 2 J
@@ -1369,7 +1369,7 @@
 
       if (mapped)
         XClearArea (dpy, vt, 0,
-                    Row2Pixel (row - view_start), (unsigned int)width,
+                    Row2Pixel (row - view_start), (unsigned int)vt_width,
                     (unsigned int)Height2Pixel (num), False);
     }
   else
@@ -1382,7 +1382,7 @@
           XChangeGC (dpy, gc, GCForeground, &gcvalue);
           XFillRectangle (dpy, vt, gc,
                           0, Row2Pixel (row - view_start),
-                          (unsigned int)width,
+                          (unsigned int)vt_width,
                           (unsigned int)Height2Pixel (num));
           gcvalue.foreground = pix_colors[Color_fg];
           XChangeGC (dpy, gc, GCForeground, &gcvalue);
@@ -1878,7 +1878,7 @@
 void
 rxvt_term::scr_touch (bool refresh) NOTHROW
 {
-  scr_expose (0, 0, width, height, refresh);
+  scr_expose (0, 0, vt_width, vt_height, refresh);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2169,7 +2169,6 @@
       int i = num_scr;
       int j;
       int len, wlen;
-      dLocal (int, num_scr);
 
       j = nrow;
       wlen = len = -1;
@@ -2670,26 +2669,8 @@
 void
 rxvt_term::scr_dump (int fd) NOTHROW
 {
-  int             row, wrote;
-  unsigned int    width, towrite;
-  const char      r1[] = "\n";
-
-  for (row = saveLines + top_row;
-       row < saveLines + nrow - 1; row++)
-    {
-      width = row_buf[row].l >= 0 ? row_buf[row].l
-              : ncol;
-      for (towrite = width; towrite; towrite -= wrote)
-        {
-          wrote = write (fd, & (row_buf[row].t[width - towrite]),
-                        towrite);
-          if (wrote < 0)
-            return;         /* XXX: death, no report */
-        }
-      if (row_buf[row].l >= 0)
-        if (write (fd, r1, 1) <= 0)
-          return; /* XXX: death, no report */
-    }
+  // if this method is needed, it can be implemented by factoring the
+  // relevant code in scr_printscreen
 }
 #endif