Merge branch 'obsd-master'

Conflicts:
	Makefile.am
	cfg.c
	server-client.c
This commit is contained in:
Thomas Adam
2017-05-31 15:56:13 +01:00
29 changed files with 2614 additions and 2008 deletions

2
cfg.c
View File

@ -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]);