--- rxvt-unicode/src/screen.C	2005/01/14 17:15:26	1.153
+++ rxvt-unicode/src/screen.C	2005/02/03 07:45:39	1.155
@@ -336,10 +336,10 @@
               screen.s_cur.row += k;
               TermWin.nscrolled -= k;
             }
+
 #ifdef DEBUG_STRICT
           assert (screen.cur.row < TermWin.nrow);
 #else                           /* drive with your eyes closed */
-
           MIN_IT (screen.cur.row, nrow - 1);
 #endif
           TermWin.ncol =  ncol; // save b/c scr_blank_screen_mem uses this
@@ -3411,7 +3411,7 @@
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if ((options & Opt_tripleclickwords))
+      if (options & Opt_tripleclickwords)
         {
           int end_row;
 
@@ -3439,6 +3439,15 @@
 
           selection.beg.col = 0;
           selection.end.col = ncol;
+
+          // select a complete logical line
+          while (selection.beg.row > -TermWin.saveLines
+                 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
+            selection.beg.row--;
+
+          while (selection.end.row < TermWin.nrow
+                 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
+            selection.end.row++;
         }
     }