--- rxvt-unicode/src/urxvt.pm	2007/11/30 01:22:26	1.161
+++ rxvt-unicode/src/urxvt.pm	2008/06/05 08:40:39	1.166
@@ -1093,7 +1093,7 @@
 
 =cut
 
-our $VERSION = 1;
+our $VERSION = '3.4';
 
 $INC{"urxvt/anyevent.pm"} = 1; # mark us as there
 push @AnyEvent::REGISTRY, [urxvt => urxvt::anyevent::];
@@ -1134,20 +1134,6 @@
    $_[0][1]->stop;
 }
 
-sub condvar {
-   bless \my $flag, urxvt::anyevent::
-}
-
-sub broadcast {
-   ${$_[0]}++;
-}
-
-sub wait {
-   unless (${$_[0]}) {
-      Carp::croak "AnyEvent->condvar blocking wait unsupported in urxvt, use a non-blocking API";
-   }
-}
-
 sub one_event {
    Carp::croak "AnyEvent->one_event blocking wait unsupported in urxvt, use a non-blocking API";
 }
@@ -1287,7 +1273,7 @@
   preeditType print_pipe pty_fd reverseVideo saveLines scrollBar
   scrollBar_align scrollBar_floating scrollBar_right scrollBar_thickness
   scrollTtyKeypress scrollTtyOutput scrollWithBuffer scrollstyle
-  secondaryScreen secondaryScroll selectstyle shade term_name title
+  secondaryScreen secondaryScroll shade term_name title
   transient_for transparent transparent_all tripleclickwords utmpInhibit
   visualBell
 
@@ -1613,10 +1599,9 @@
 
 =item $text = $term->ROW_t ($row_number[, $new_text[, $start_col]])
 
-Returns the text of the entire row with number C<$row_number>. Row C<0>
-is the topmost terminal line, row C<< $term->$ncol-1 >> is the bottommost
-terminal line. The scrollback buffer starts at line C<-1> and extends to
-line C<< -$term->nsaved >>. Nothing will be returned if a nonexistent line
+Returns the text of the entire row with number C<$row_number>. Row C<< $term->top_row >>
+is the topmost terminal line, row C<< $term->nrow-1 >> is the bottommost
+terminal line. Nothing will be returned if a nonexistent line
 is requested.
 
 If C<$new_text> is specified, it will replace characters in the current
@@ -1627,7 +1612,7 @@
 C<$text> is in a special encoding: tabs and wide characters that use more
 than one cell when displayed are padded with C<$urxvt::NOCHAR> (chr 65535)
 characters. Characters with combining characters and other characters that
-do not fit into the normal tetx encoding will be replaced with characters
+do not fit into the normal text encoding will be replaced with characters
 in the private use area.
 
 You have to obey this encoding when changing text. The advantage is
@@ -1956,14 +1941,21 @@
    delete $env->{LC_ALL};
    $env->{LC_CTYPE} = $self->{term}->locale;
 
-   urxvt::term->new ($env, "popup",
-                     "--perl-lib" => "", "--perl-ext-common" => "",
-                     "-pty-fd" => -1, "-sl" => 0,
-                     "-b" => 1, "-bd" => "grey80", "-bl", "-override-redirect",
-                     "--transient-for" => $self->{term}->parent,
-                     "-display" => $self->{term}->display_id,
-                     "-pe" => "urxvt-popup")
-      or die "unable to create popup window\n";
+   my $term = urxvt::term->new (
+      $env, "popup",
+      "--perl-lib" => "", "--perl-ext-common" => "",
+      "-pty-fd" => -1, "-sl" => 0,
+      "-b" => 1, "-bd" => "grey80", "-bl", "-override-redirect",
+      "--transient-for" => $self->{term}->parent,
+      "-display" => $self->{term}->display_id,
+      "-pe" => "urxvt-popup",
+   ) or die "unable to create popup window\n";
+
+   unless (delete $term->{urxvt_popup_init_done}) {
+      $term->ungrab;
+      $term->destroy;
+      die "unable to initialise popup window\n";
+   }
 }
 
 sub DESTROY {