Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h

1 files changed, 1 insertions, 1 deletions

diff --git a/tty-keys.c b/tty-keys.c
index c1de2ab7..309e8c04 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -564,7 +564,7 @@ partial_key:
 	}
 
 	/* Get the time period. */
-	delay = options_get_number(&global_options, "escape-time");
+	delay = options_get_number(global_options, "escape-time");
 	tv.tv_sec = delay / 1000;
 	tv.tv_usec = (delay % 1000) * 1000L;