--- rxvt-unicode/src/urxvt.pm	2006/01/09 02:06:43	1.62
+++ rxvt-unicode/src/urxvt.pm	2006/01/09 19:25:57	1.65
@@ -1117,7 +1117,7 @@
 
 =item $success = $term->grab_button ($button, $modifiermask)
 
-Registers a synchronous button grab. See XGrabButton.
+Registers a synchronous button grab. See the XGrabButton manpage.
 
 =item $success = $term->grab ($eventtime[, $sync])
 
@@ -1175,7 +1175,7 @@
    $self->add_item ({
       rend => { normal => "\x1b[0;30;47m", hover => "\x1b[0;30;47m", active => "\x1b[0;30;47m" },
       text => "",
-      render => sub { $sep x $urxvt::TERM->ncol },
+      render => sub { $sep x $self->{term}->ncol },
       activate => sub { },
    });
 }
@@ -1193,7 +1193,7 @@
 sub add_button {
    my ($self, $text, $cb) = @_;
 
-   $self->add_item ({ type => "button", text => "[ $text ]", activate => $cb});
+   $self->add_item ({ type => "button", text => $text, activate => $cb});
 }
 
 sub add_toggle {
@@ -1215,8 +1215,11 @@
 
    local $urxvt::popup::self = $self;
 
+   local $ENV{LC_ALL} = $self->{term}->locale;
+
    urxvt->new ("--perl-lib" => "", "--perl-ext-common" => "", "-pty-fd" => -1, "-sl" => 0, "-b" => 0,
                "--transient-for" => $self->{term}->parent,
+               "-display" => $self->{term}->display_id,
                "-pe" => "urxvt-popup")
       or die "unable to create popup window\n";
 }