--- rxvt-unicode/src/screen.C	2011/11/16 18:26:47	1.406
+++ rxvt-unicode/src/screen.C	2011/11/17 10:43:16	1.408
@@ -551,7 +551,12 @@
   want_refresh = 1;
   view_start = 0;
 
-  selection_check (2);        /* check for boundary cross */
+  /* check for boundary cross */
+  row_col_t pos;
+  pos.row = pos.col = 0;
+  if (ROWCOL_IS_BEFORE (selection.beg, pos)
+      && ROWCOL_IS_AFTER (selection.end, pos))
+    CLEAR_SELECTION ();
 
   current_screen = scrn;
 
@@ -1309,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
@@ -1418,7 +1423,11 @@
   ZERO_SCROLLBACK ();
 
   num_scr_allow = 0;
-  selection_check (3);
+
+  row_col_t pos;
+  pos.row = pos.col = 0;
+  if (ROWCOL_IS_AFTER (selection.end, pos))
+    CLEAR_SELECTION ();
 
   fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
   for (int row = nrow; row--; )
@@ -2693,21 +2702,13 @@
   if (!selection.op)
     return;
 
-  row_col_t pos;
-  pos.row = pos.col = 0;
-
   if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
       || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
       || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
-          && ROWCOL_IS_BEFORE (screen.cur, selection.end))
-      || (check_more == 2
-          && ROWCOL_IS_BEFORE (selection.beg, pos)
-          && ROWCOL_IS_AFTER (selection.end, pos))
-      || (check_more == 3
-          && ROWCOL_IS_AFTER (selection.end, pos)))
+          && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
     CLEAR_ALL_SELECTION ();
 }