--- rxvt-unicode/src/urxvt.pm	2006/01/17 17:09:26	1.99
+++ rxvt-unicode/src/urxvt.pm	2006/01/18 10:11:03	1.101
@@ -91,6 +91,24 @@
 text into various other formats/action (such as uri unescaping, perl
 evalution, web-browser starting etc.), depending on content.
 
+Other extensions can extend this popup menu by pushing a code reference onto
+C<@urxvt::ext::selection_popup::hook>, that is called whenever the popup is displayed.
+
+It's sole argument is the popup menu, which can be modified. The selection
+is in C<$_>, which can be used to decide wether to add something or not.
+It should either return nothing or a string and a code reference. The
+string will be used as button text and the code reference will be called
+when the button gets activated and should transform C<$_>.
+
+The following will add an entry C<a to b> that transforms all C<a>s in
+the selection to C<b>s, but only if the selection currently contains any
+C<a>s:
+
+   push urxvt::ext::selection_popup::hook, sub {
+      /a/ ? ("a to be" => sub { s/a/b/g }
+          : ()
+   };
+
 =item searchable-scrollback<hotkey> (enabled by default)
 
 Adds regex search functionality to the scrollback buffer, triggered
@@ -597,8 +615,6 @@
 =cut
 
 BEGIN {
-   urxvt->bootstrap;
-
    # overwrite perl's warn
    *CORE::GLOBAL::warn = sub {
       my $msg = join "", @_;
@@ -621,24 +637,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: $!";
 
+      @{"$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";