Merge branch 'obsd-master'

Conflicts:
	client.c
This commit is contained in:
Thomas Adam
2014-08-09 20:31:36 +01:00
17 changed files with 249 additions and 189 deletions

View File

@ -1065,9 +1065,6 @@ window_pane_key(struct window_pane *wp, struct session *sess, int key)
{
struct window_pane *wp2;
if (!window_pane_visible(wp))
return;
if (wp->mode != NULL) {
if (wp->mode->key != NULL)
wp->mode->key(wp, sess, key);