mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-07-09 10:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-07-09 09:30:06 +01:00
parent 7ac0d6bead 3a6c717bb8
commit dfb2a9404f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tmux.1
View File

@@ -2342,7 +2342,8 @@ but also exit copy mode if the cursor reaches the bottom.
.It Xo
.Ic scroll\-exit\-on
.Xc
Turn on exiting copy mode when scrolling to the end of the buffer.
Turn on exiting copy mode when scrolling to the end of the buffer, unless a
selection is present.
.It Xo
.Ic scroll\-exit\-off
.Xc
@@ -2619,6 +2620,7 @@ instead of
.Fl e
specifies that scrolling to the bottom of the history (to the visible screen)
should exit copy mode.
This will not happen if a selection is present.
While in copy mode, pressing a key other than those used for scrolling will
disable this behaviour.
This is intended to allow fast scrolling through a pane's history, for

6
window-copy.c
View File

@@ -854,7 +854,7 @@ window_copy_scroll1(struct window_mode_entry *wme, struct window_pane *wp,
window_copy_cursor_end_of_line(wme);
}
if (scroll_exit && data->oy == 0) {
if (scroll_exit && data->oy == 0 && data->screen.sel == NULL) {
window_pane_reset_mode(wp);
return;
}
@@ -972,7 +972,7 @@ window_copy_pagedown1(struct window_mode_entry *wme, int half_page,
window_copy_cursor_end_of_line(wme);
}
if (scroll_exit && data->oy == 0)
if (scroll_exit && data->oy == 0 && data->screen.sel == NULL)
return (1);
if (data->searchmark != NULL && !data->timeout)
window_copy_search_marks(wme, NULL, data->searchregex, 1);
@@ -2352,7 +2352,7 @@ window_copy_cmd_scroll_down(struct window_copy_cmd_state *cs)
for (; np != 0; np--)
window_copy_cursor_down(wme, 1);
if (data->scroll_exit && data->oy == 0)
if (data->scroll_exit && data->oy == 0 && data->screen.sel == NULL)
return (WINDOW_COPY_CMD_CANCEL);
return (WINDOW_COPY_CMD_NOTHING);
}