*** empty log message ***

diff --git a/Changes b/Changes
index b102f921fd25b1c3c734dd637c02ab017b9df688..43005f77b2dae8642c64f04ca5b0aaccd94d4a1a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -18,7 +18,6 @@ WISH: anyevent mouse notification / manage MotionMask better.
 WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
-TODO: incremental reggex search should not nuke the selection, its evilish
 8.
        - new option: skipScroll/-ss, enabled by default.
         - go with the times and expect x11 library files in /usr/lib, not

diff --git a/src/perl/searchable-scrollback b/src/perl/searchable-scrollback
index 6f9565e7ab49bc42913fc48b679a0eb034c2694a..bf8f4cad6a1f393a550509a0e85f7c2e1721d28d 100644 (file)
--- a/src/perl/searchable-scrollback
+++ b/src/perl/searchable-scrollback
@@ -125,7 +125,7 @@ sub key_press {
    delete $self->{manpage_overlay};
 
    if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
-      if ($self->{found}) {
+      if ($self->{found} && $event->{state} & urxvt::ShiftMask) {
          my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
          $self->selection_beg ($br, $bc);
          $self->selection_end ($er, $ec);

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 7c65698d84f43acaf5e1dc15473ca042db53da3b..0153bfe08758686771ed1179f9e5cc2ac768b6ed 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -154,7 +154,7 @@ search upwards/downwards in the scrollback buffer, C<End> jumps to the
 bottom. C<Escape> leaves search mode and returns to the point where search
 was started, while C<Enter> or C<Return> stay at the current position and
 additionally stores the first match in the current line into the primary
-selection.
+selection if the C<Shift> modifier is active.
 
 The regex defaults to "(?i)", resulting in a case-insensitive search. To
 get a case-sensitive search you can delete this prefix using C<BackSpace>