[PATCH] confirm-paste: Change y/p/n to y/f/n to preserve compatibility with previous y/n

[Petr Vorel]

From: Michal Suchanek <msuchanek at suse.de>

Initially confirm-paste offerted only two choices y(yes)/n(no).

That was later changed to y(filter)/p(yes)/n(no).

Change to y(yes)/f(filter)/n(no) to be compatible with the initial
implementation.

Signed-off-by: Michal Suchanek <msuchanek at suse.de>
---
Dear rxvt-unicode distro maintainers,

What do you think about this patch?

You probably noticed keyboard shortcut change for confirmation of
the pasting with <ctrl> + <insert> in rxvt-unicode 9.31.

Michal contacted the upstream author Marc Lehmann, but the reaction was:
"just get over it, its trivial to override confirm-paste with a patch
version that changes whatever you want"

We don't think it's a good idea to have different confirm-paste keys,
thus we'd like to first to get agreement with you maintainers and then
ask again Marc to reconsider it.

Thanks a lot for info.

Kind regards,
Petr

 src/perl/confirm-paste | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/perl/confirm-paste b/src/perl/confirm-paste
index 30a42c09..8cac07c6 100644
--- a/src/perl/confirm-paste
+++ b/src/perl/confirm-paste
@@ -7,9 +7,9 @@ confirm-paste - ask for confirmation before pasting control characters
 =head1 DESCRIPTION
 
 Displays a confirmation dialog when a paste containing control characters
-is detected. The user can choose C<y> to either paste a sanitized variant
-where all control characters are removed, C<p> to paste the string
-unmodified or C<n> to drop the paste request completely.
+is detected. The user can either choose C<y> to paste the string unmodified,
+C<f> to paste a sanitized variant where all control characters are removed,
+or C<n> to drop the paste request completely.
 
 This is mostly meant as a defense-in-depth mechanism to protect against
 the common web browser bug of you selecting some text but the browser
@@ -25,7 +25,7 @@ U+001F currrently) is pasted into the terminal, this extension will ask
 whether it should be pasted. Strings without control characters get pasted
 without prompt.
 
-When a sanitized version is pasted (choice C<y>), then contiguous
+When a sanitized version is pasted (choice C<f>), then contiguous
 sequences of those control characters will be replaced by a single spaces.
 
 The exact detection and sanitization algorithm is subject to change in
@@ -47,7 +47,7 @@ sub on_tt_paste {
       or return;
 
    $self->{paste} = \$str;
-   $self->msg ("Pasting $count control characters, continue? (y/p/n)");
+   $self->msg ("Pasting $count control characters, continue? (y/f/n)");
 
    my $preview = substr $self->locale_decode ($str), 0, $self->ncol;
    $preview =~ s/\n/\\n/g;
@@ -72,12 +72,12 @@ sub key_press {
 
    my $paste = delete $self->{paste};
 
-   if ($keysym == 121) { # y
+   if ($keysym == 102) { # f
       my $paste = $$paste;
       $paste =~ s/[\x00-\x1f]+/ /g;
       $self->tt_paste ($paste);
       $self->leave;
-   } elsif ($keysym == 112) { # p
+   } elsif ($keysym == 121) { # y
       $self->tt_paste ($$paste);
       $self->leave;
    } elsif ($keysym == 110) { # n
-- 
2.42.0