--- rxvt-unicode/src/urxvt.pm	2006/01/04 05:35:34	1.30
+++ rxvt-unicode/src/urxvt.pm	2006/01/04 19:39:46	1.31
@@ -368,6 +368,8 @@
    }
 }
 
+our $retval; # return value for urxvt
+
 # called by the rxvt core
 sub invoke {
    local $TERM = shift;
@@ -385,37 +387,45 @@
             warn "perl extension '$ext' not found in perl library search path\n";
          }
       }
+   }
+
+   $retval = undef;
 
-   } elsif ($htype == 1) { # DESTROY
+   if (my $cb = $TERM->{_hook}[$htype]) {
+      verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")"
+         if $verbosity >= 10;
+
+      keys %$cb;
+
+      while (my ($pkg, $cb) = each %$cb) {
+         $retval = $cb->(
+            $TERM->{_pkg}{$pkg} ||= do {
+               my $proxy = bless { }, urxvt::term::proxy::;
+               Scalar::Util::weaken ($proxy->{term} = $TERM);
+               $proxy
+            },
+            @_,
+         ) and last;
+      }
+   }
+
+   if ($htype == 1) { # DESTROY
+      # remove hooks if unused
       if (my $hook = $TERM->{_hook}) {
          for my $htype (0..$#$hook) {
             $hook_count[$htype] -= scalar keys %{ $hook->[$htype] || {} }
                or set_should_invoke $htype, 0;
          }
       }
-   }
-
-   my $cb = $TERM->{_hook}[$htype]
-      or return;
-
-   verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")"
-      if $verbosity >= 10;
 
-   keys %$cb;
+      # clear package objects
+      %$_ = () for values %{ $TERM->{_pkg} };
 
-   while (my ($pkg, $cb) = each %$cb) {
-      return 1
-         if $cb->(
-               $TERM->{$pkg} ||= do {
-                  my $proxy = bless { }, urxvt::term::proxy::;
-                  Scalar::Util::weaken ($proxy->{term} = $TERM);
-                  $proxy
-               },
-               @_,
-            );
+      # clear package
+      %$TERM = ();
    }
 
-   0
+   $retval
 }
 
 sub urxvt::term::proxy::AUTOLOAD {