--- rxvt-unicode/src/perl/selection-popup	2011/01/04 21:35:35	1.23
+++ rxvt-unicode/src/perl/selection-popup	2012/06/06 15:06:41	1.25
@@ -1,5 +1,7 @@
 #! perl
 
+#:META:X_RESOURCE:url-launcher:string:shell command to use
+
 sub msg {
    my ($self, $msg) = @_;
 
@@ -14,7 +16,7 @@
 sub on_start {
    my ($self) = @_;
 
-   $self->{browser} = $self->x_resource ("urlLauncher") || "sensible-browser";
+   $self->{browser} = $self->x_resource ("url-launcher") || "sensible-browser";
 
    $self->grab_button (3, urxvt::ControlMask);
 
@@ -63,7 +65,7 @@
             and $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
 
          /./
-            and $add_button->("eval perl expression" => sub { no warnings; $_ = eval $_ });
+            and $add_button->("eval perl expression" => sub { my $self = $self; no warnings; $_ = eval $_; $_ = "$@" if $@ });
 
          /./
             and $add_button->((sprintf "to unicode hex index (%x)", ord) => sub { $_ = sprintf "%x", ord });