Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
This commit is contained in:
Thomas Adam
2015-10-27 23:27:26 +00:00
43 changed files with 872 additions and 824 deletions

View File

@@ -170,7 +170,7 @@ input_key(struct window_pane *wp, int key, struct mouse_event *m)
* Then try to look this up as an xterm key, if the flag to output them
* is set.
*/
if (options_get_number(&wp->window->options, "xterm-keys")) {
if (options_get_number(wp->window->options, "xterm-keys")) {
if ((out = xterm_keys_lookup(key)) != NULL) {
bufferevent_write(wp->event, out, strlen(out));
free(out);