--- rxvt-unicode/src/perl/confirm-paste	2012/06/10 17:31:53	1.5
+++ rxvt-unicode/src/perl/confirm-paste	2020/02/06 23:41:15	1.8
@@ -2,9 +2,9 @@
 
 =head1 NAME
 
-   confirm-paste - ask for confirmation before pasting multiline text
+confirm-paste - ask for confirmation before pasting multiline text
 
-=head1 DESCRPTION
+=head1 DESCRIPTION
 
 Displays a confirmation dialog when a paste containing at least a full
 line is detected.
@@ -21,14 +21,15 @@
 sub on_tt_paste {
    my ($self, $str) = @_;
 
-   my $count = ($str =~ tr/\012\015//);
+   my $count = ($str =~ tr/[\x00-\x1f\x80-\x9f]//);
 
    return unless $count;
 
    $self->{paste} = \$str;
-   $self->msg ("Paste of $count lines, continue? (y/n)");
+   $self->msg ("Pasting $count control characters, continue? (y/n)");
    my $preview = substr $self->locale_decode ($str), 0, $self->ncol;
    $preview =~ s/\n/\\n/g;
+   $preview =~ s/([\x00-\x1f\x80-\x9f])/sprintf "\\x%02x", ord $1/ge;
    $self->{overlay}->set (0, 1, $self->special_encode ($preview));
    $self->enable (key_press => \&key_press);