--- rxvt-unicode/src/perl/selection-popup	2006/01/09 04:19:36	1.4
+++ rxvt-unicode/src/perl/selection-popup	2006/01/09 19:25:57	1.7
@@ -1,12 +1,10 @@
 #! perl
 
 sub msg {
-   my ($self, $msg1, $msg2) = @_;
+   my ($self, $msg) = @_;
 
-   my $overlay = $self->overlay (0, 0,
-      (List::Util::max map $self->strwidth ($_), $msg1, $msg2), 2);
-   $overlay->set (0, 0, $msg1);
-   $overlay->set (0, 1, $msg2);
+   my $overlay = $self->overlay (0, 0, $self->strwidth ($msg), 1);
+   $overlay->set (0, 0, $msg);
    my $iow; $iow = urxvt::timer->new->start (urxvt::NOW + 1)->cb (sub {
       undef $overlay;
       undef $iow;
@@ -46,7 +44,8 @@
 
                if ($orig ne $_) {
                   $self->selection ($_);
-                  $self->msg ("Selection replaced by", $_);
+                  s/[\x00-\x1f\x80-\x9f]/·/g;
+                  $self->msg ($self->special_encode ($_));
                }
             }
          });
@@ -56,7 +55,7 @@
          $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
 
          urxvt::safe
-            and $add_button->("eval perl expression" => sub { $_ = eval urxvt::untaint $_ });
+            and $add_button->("eval perl expression" => sub { no warnings; $_ = eval urxvt::untaint $_ });
 
          /^(\S+):(\d+):?$/
             and $add_button->("vi-commands to load '$1'" => sub { s/^(\S+):(\d+):?$/\x1b:e $1\x0d:$2\x0d/ });