circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-07-08 23:02:26 +01:00
commit ab244cc7ad
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
window-copy.c
View File

@ -577,6 +577,7 @@ window_copy_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
struct screen *s = &data->screen; struct screen *s = &data->screen;
struct screen_write_ctx ctx; struct screen_write_ctx ctx;
int search;
screen_resize(s, sx, sy, 1); screen_resize(s, sx, sy, 1);
if (data->backing != &wp->base) if (data->backing != &wp->base)
@ -589,13 +590,15 @@ window_copy_resize(struct window_mode_entry *wme, u_int sx, u_int sy)
if (data->oy > screen_hsize(data->backing)) if (data->oy > screen_hsize(data->backing))
data->oy = screen_hsize(data->backing); data->oy = screen_hsize(data->backing);
search = (data->searchmark != NULL);
window_copy_clear_selection(wme); window_copy_clear_selection(wme);
window_copy_clear_marks(wme);
screen_write_start(&ctx, NULL, s); screen_write_start(&ctx, NULL, s);
window_copy_write_lines(wme, &ctx, 0, screen_size_y(s) - 1); window_copy_write_lines(wme, &ctx, 0, screen_size_y(s) - 1);
screen_write_stop(&ctx); screen_write_stop(&ctx);
if (data->searchmark != NULL) if (search)
window_copy_search_marks(wme, NULL); window_copy_search_marks(wme, NULL);
data->searchx = data->cx; data->searchx = data->cx;
data->searchy = data->cy; data->searchy = data->cy;