Merge branch 'obsd-master'

Conflicts:
	Makefile.am
	cfg.c
	server-client.c

1 files changed, 1 insertions, 1 deletions

diff --git a/cfg.c b/cfg.c
index dd621bb0..badfe038 100644
--- a/cfg.c
+++ b/cfg.c
@@ -233,7 +233,7 @@ cfg_show_causes(struct session *s)
 		return;
 	wp = s->curw->window->active;
 
-	window_pane_set_mode(wp, &window_copy_mode);
+	window_pane_set_mode(wp, &window_copy_mode, NULL, NULL);
 	window_copy_init_for_output(wp);
 	for (i = 0; i < cfg_ncauses; i++) {
 		window_copy_add(wp, "%s", cfg_causes[i]);