--- rxvt-unicode/src/perl/selection	2006/01/25 15:33:43	1.36
+++ rxvt-unicode/src/perl/selection	2006/11/04 22:56:30	1.41
@@ -23,6 +23,12 @@
       push @{ $self->{patterns} }, qr/$res/;
    }
 
+   $self->{enabled} = 1;
+
+   push @{ $self->{term}{option_popup_hook} }, sub {
+      ("new selection" => $self->{enabled}, sub { $self->{enabled} = shift })
+   };
+
    ()
 }
 
@@ -40,8 +46,8 @@
 
    # urls, just a heuristic
    qr{(
-      (?:https?|ftp|news|mailto|file)://[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
-      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
+      (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
+      [ab-zA-Z0-9\-\@;\/?:&=%\$_+*()~]   # exclude some trailing characters (heuristic)
    )}x,
 
    # shell-like argument quoting, basically always matches
@@ -64,6 +70,9 @@
 sub on_sel_extend {
    my ($self, $time) = @_;
 
+   $self->{enabled}
+      or return;
+
    my ($row, $col) = $self->selection_mark;
    my $line = $self->line ($row);
    my $text = $line->t;
@@ -74,7 +83,7 @@
    my @matches;
 
    if ($markofs < $line->l) {
-      # convert markofs form character to UTF-8 offset space
+      # convert markofs from character to UTF-8 offset space
       {
          my $prefix = substr $text, 0, $markofs;
          utf8::encode $prefix;