--- rxvt-unicode/src/perl/selection-autotransform	2006/01/17 16:22:41	1.5
+++ rxvt-unicode/src/perl/selection-autotransform	2011/11/20 11:09:22	1.8
@@ -5,7 +5,7 @@
 
    my $overlay = $self->overlay (0, 0, $self->strwidth ($msg), 1);
    $overlay->set (0, 0, $msg);
-   my $iow; $iow = urxvt::timer->new->start (urxvt::NOW + 2)->cb (sub {
+   my $iow; $iow = urxvt::timer->new->after (2)->cb (sub {
       undef $overlay;
       undef $iow;
    });
@@ -25,12 +25,21 @@
       }
    }
 
+   $self->{enabled} = 1;
+
+   push @{ $self->{term}{option_popup_hook} }, sub {
+      ("autotransform" => $self->{enabled}, sub { $self->{enabled} = shift })
+   };
+
    ()
 }
 
 sub on_sel_grab {
    my ($self) = @_;
 
+   $self->{enabled}
+      or return;
+
    my $text = $self->selection;
    local $_ = $text;
 
@@ -43,7 +52,7 @@
          last;
       }
    }
-      
+
    ()
 }