--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/12 11:16:36	1.19
+++ rxvt-unicode/src/perl/searchable-scrollback	2006/01/15 06:02:41	1.20
@@ -81,7 +81,7 @@
 
    no re 'eval'; # just to be sure
    if (my $re = eval { qr/$search/ }) {
-      while ($self->nrow > $row && $row > -$self->nsaved) {
+      while ($self->nrow > $row && $row > $self->top_row) {
          my $line = $self->line ($row)
             or last;
 
@@ -92,7 +92,7 @@
             } while $text =~ /$re/g;
 
             $self->{row} = $row;
-            $self->view_start (List::Util::max 0, -$row + ($self->nrow >> 1));
+            $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
             $self->want_refresh;
             last;
          }
@@ -138,7 +138,7 @@
       $self->{row} = $self->nrow - 1;
       $self->view_start (0);
    } elsif ($keysym == 0xff52) { # up
-      $self->{row}-- if $self->{row} > -$self->nsaved;
+      $self->{row}-- if $self->{row} > $self->top_row;
       $self->search (-1);
    } elsif ($keysym == 0xff54) { # down
       $self->{row}++ if $self->{row} < $self->nrow;