diff options
author | nicm <nicm> | 2014-01-22 13:57:49 +0000 |
---|---|---|
committer | nicm <nicm> | 2014-01-22 13:57:49 +0000 |
commit | df680d725751e0fe9eca4403c732ec1332d91d97 (patch) | |
tree | c203ce988c6649ae65cc6273a04ae98e6bf006a6 | |
parent | 938768ed3de3e38cb96344b8ec7b794b5e828acf (diff) |
Only exit copy mode at the bottom if no selection in progress, from
Benoit Pierre.
-rw-r--r-- | window-copy.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/window-copy.c b/window-copy.c index dd4f23fa..ddd5bf41 100644 --- a/window-copy.c +++ b/window-copy.c @@ -853,8 +853,12 @@ window_copy_mouse( } else if (m->wheel == MOUSE_WHEEL_DOWN) { for (i = 0; i < 5; i++) window_copy_cursor_down(wp, 1); - if (data->oy == 0) - goto reset_mode; + /* + * We reached the bottom, leave copy mode, + * but only if no selection is in progress. + */ + if (data->oy == 0 && !s->sel.flag) + goto reset_mode; } return; } |