--- rxvt-unicode/src/urxvt.pm	2006/01/17 13:19:45	1.95
+++ rxvt-unicode/src/urxvt.pm	2006/01/18 08:33:34	1.100
@@ -78,23 +78,6 @@
 
    URxvt.keysym.C-M-r: perl:selection:rot13
 
-=item remote-pastebin
-
-Upload the selection as textfile to a remote site.
-
-   URxvt.keysym.C-M-e: perl:selection:remote-pastebin
-
-To set the command to upload the file set this resource:
-
-   URxvt.selection-pastebin-cmd: rsync -apP % ruth:/var/www/www.ta-sa.org/files/txt/.
-
-The % is the placeholder for the textfile. The name of the textfile is the hex encoded 
-md5 sum of the selection.
-After an successful upload the selection will be replaced by the following url 
-(the % is the placeholder for the filename):
-
-   URxvt.selection-pastebin-url: http://www.ta-sa.org/files/txt/%
-
 =back
 
 =item option-popup (enabled by default)
@@ -181,6 +164,35 @@
 window. Illustrates overwriting the refresh callbacks to create your own
 overlays or changes.
 
+=item selection-pastebin
+
+This is a little rarely useful extension that Uploads the selection as
+textfile to a remote site (or does other things). (The implementation is
+not currently secure for use in a multiuser environment as it writes to
+F</tmp> directly.).
+
+It listens to the C<selection-pastebin:remote-pastebin> keyboard command,
+i.e.
+
+   URxvt.keysym.C-M-e: perl:selection-pastebin:remote-pastebin
+
+Pressing this combination runs a command with C<%> replaced by the name of
+the textfile. This command can be set via a resource:
+
+   URxvt.selection-pastebin.cmd: rsync -apP % ruth:/var/www/www.ta-sa.org/files/txt/.
+
+And the default is likely not useful to anybody but the few people around
+here :)
+
+The name of the textfile is the hex encoded md5 sum of the selection, so
+the same content should lead to the same filename.
+
+After a successful upload the selection will be replaced by the text given
+in the C<selection-pastebin-url> resource (again, the % is the placeholder
+for the filename):
+
+   URxvt.selection-pastebin.url: http://www.ta-sa.org/files/txt/%
+
 =back
 
 =head1 API DOCUMENTATION
@@ -500,12 +512,6 @@
 
 Messages have a size limit of 1023 bytes currently.
 
-=item $is_safe = urxvt::safe
-
-Returns true when it is safe to do potentially unsafe things, such as
-evaluating perl code specified by the user. This is true when urxvt was
-started setuid or setgid.
-
 =item $time = urxvt::NOW
 
 Returns the "current time" (as per the event loop).
@@ -591,8 +597,6 @@
 =cut
 
 BEGIN {
-   urxvt->bootstrap;
-
    # overwrite perl's warn
    *CORE::GLOBAL::warn = sub {
       my $msg = join "", @_;
@@ -615,24 +619,29 @@
    warn "$msg\n" if $level <= $verbosity;
 }
 
-my $extension_pkg = "extension0000";
 my %extension_pkg;
 
 # load a single script into its own package, once only
 sub extension_package($) {
    my ($path) = @_;
 
+   no strict 'refs';
+
    $extension_pkg{$path} ||= do {
-      my $pkg = "urxvt::" . ($extension_pkg++);
+      $path =~ /([^\/\\]+)$/;
+      my $pkg = $1;
+      $pkg =~ s/[^[:word:]]/_/g;
+      $pkg = "urxvt::ext::$pkg";
 
       verbose 3, "loading extension '$path' into package '$pkg'";
 
       open my $fh, "<:raw", $path
          or die "$path: $!";
 
-      my $source = untaint
+      @{"$pkg\::ISA"} = urxvt::term::extension::;
+
+      my $source =
          "package $pkg; use strict; use utf8;\n"
-         . "use base urxvt::term::extension::;\n"
          . "#line 1 \"$path\"\n{\n"
          . (do { local $/; <$fh> })
          . "\n};\n1";