Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-06-26 13:02:25 +01:00
commit 486ce9b098

View File

@ -2438,12 +2438,11 @@ void
window_copy_add_formats(struct window_pane *wp, struct format_tree *ft) window_copy_add_formats(struct window_pane *wp, struct format_tree *ft)
{ {
struct window_copy_mode_data *data = wp->modedata; struct window_copy_mode_data *data = wp->modedata;
struct screen *s = &data->screen;
if (wp->mode != &window_copy_mode) if (wp->mode != &window_copy_mode)
return; return;
format_add(ft, "selection_present", "%d", s->sel.flag); format_add(ft, "selection_present", "%d", data->screen.sel.flag);
format_add(ft, "scroll_position", "%d", data->oy); format_add(ft, "scroll_position", "%d", data->oy);
} }