aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-07-08 23:02:26 +0100
committerThomas Adam <thomas@xteddy.org>2019-07-08 23:02:26 +0100
commitab244cc7ad9fa83be82c22b3f7676684a729053e (patch)
tree53ddcf116596e90aa2f3f9ac9d59930ff787ab2c /window-copy.c
parent29b2d07b6b7f55cd98afbb018027889494c999a7 (diff)
parenta4be028b76b8cc9c2066e30db8dc3866b52418ef (diff)
downloadrtmux-ab244cc7ad9fa83be82c22b3f7676684a729053e.tar.gz
rtmux-ab244cc7ad9fa83be82c22b3f7676684a729053e.tar.bz2
rtmux-ab244cc7ad9fa83be82c22b3f7676684a729053e.zip
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c
index 28d728bb..d868631c 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -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 screen *s = &data->screen;
struct screen_write_ctx ctx;
+ int search;
screen_resize(s, sx, sy, 1);
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))
data->oy = screen_hsize(data->backing);
+ search = (data->searchmark != NULL);
window_copy_clear_selection(wme);
+ window_copy_clear_marks(wme);
screen_write_start(&ctx, NULL, s);
window_copy_write_lines(wme, &ctx, 0, screen_size_y(s) - 1);
screen_write_stop(&ctx);
- if (data->searchmark != NULL)
+ if (search)
window_copy_search_marks(wme, NULL);
data->searchx = data->cx;
data->searchy = data->cy;