Merge branch 'obsd-master'

Conflicts:
	format.c
This commit is contained in:
Thomas Adam
2017-05-09 15:44:13 +01:00
12 changed files with 173 additions and 83 deletions

View File

@ -200,6 +200,7 @@ input_key(struct window_pane *wp, key_code key, struct mouse_event *m)
return;
}
}
key &= ~KEYC_XTERM;
/* Otherwise look the key up in the table. */
for (i = 0; i < nitems(input_keys); i++) {