--- rxvt-unicode/src/urxvt.pm	2006/01/08 22:58:13	1.58
+++ rxvt-unicode/src/urxvt.pm	2006/01/09 01:21:43	1.60
@@ -60,9 +60,14 @@
 
 =item option-popup (enabled by default)
 
-Binds a popup menu to Ctrl-Button3 that lets you toggle (some) options at
+Binds a popup menu to Ctrl-Button2 that lets you toggle (some) options at
 runtime.
 
+=item selection-popup (enabled by default)
+
+Binds a popup menu to Ctrl-Button3 that lets you convert the selection
+text into various other formats/action.
+
 =item digital-clock
 
 Displays a digital clock using the built-in overlay.
@@ -425,6 +430,11 @@
          unless $msg =~ /\n$/;
       urxvt::warn ($msg);
    };
+
+   delete $ENV{IFS};
+   delete $ENV{CDPATH};
+   delete $ENV{BASH_ENV};
+   $ENV{PATH} = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin:/opt/sbin";
 }
 
 my @hook_count;
@@ -467,14 +477,12 @@
       open my $fh, "<:raw", $path
          or die "$path: $!";
 
-      my $source = "package $pkg; use strict; use utf8;\n"
+      my $source = untaint "package $pkg; use strict; use utf8;\n"
                    . "use base urxvt::term::proxy::;\n"
                    . "#line 1 \"$path\"\n{\n"
                    . (do { local $/; <$fh> })
                    . "\n};\n1";
 
-      $source =~ /(.*)/s and $source = $1; # untaint
-
       eval $source or die "$path: $@";
 
       $pkg
@@ -495,7 +503,7 @@
 
       for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
          if ($_ eq "default") {
-            $want_ext{$_}++ for qw(selection option-popup);
+            $want_ext{$_}++ for qw(selection option-popup selection-popup);
          } elsif (/^-(.*)$/) {
             delete $want_ext{$1};
          } else {