Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c
This commit is contained in:
Thomas Adam
2015-08-30 21:44:01 +01:00
26 changed files with 594 additions and 388 deletions

View File

@ -518,6 +518,7 @@ session_set_current(struct session *s, struct winlink *wl)
winlink_stack_push(&s->lastw, s->curw);
s->curw = wl;
winlink_clear_flags(wl);
window_update_activity(wl->window);
return (0);
}