===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** src/usr.bin/tmux/tty-keys.c	2009/12/03 22:50:10	1.27
--- src/usr.bin/tmux/tty-keys.c	2009/12/14 10:43:41	1.28
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.27 2009/12/03 22:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.28 2009/12/14 10:43:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 429,435 ****
  	const char		*buf;
  	size_t			 len, size;
  	cc_t			 bspace;
! 	int			 key;
  
  	buf = EVBUFFER_DATA(tty->event->input);
  	len = EVBUFFER_LENGTH(tty->event->input);
--- 429,435 ----
  	const char		*buf;
  	size_t			 len, size;
  	cc_t			 bspace;
! 	int			 key, delay;
  
  	buf = EVBUFFER_DATA(tty->event->input);
  	len = EVBUFFER_LENGTH(tty->event->input);
***************
*** 521,528 ****
  
  start_timer:
  	/* Start the timer and wait for expiry or more data. */
! 	tv.tv_sec = 0;
! 	tv.tv_usec = ESCAPE_PERIOD * 1000L;
  
  	evtimer_del(&tty->key_timer);
  	evtimer_set(&tty->key_timer, tty_keys_callback, tty);
--- 521,529 ----
  
  start_timer:
  	/* Start the timer and wait for expiry or more data. */
! 	delay = options_get_number(&global_options, "escape-time");
! 	tv.tv_sec = delay / 1000;
! 	tv.tv_usec = (delay % 1000) * 1000L;
  
  	evtimer_del(&tty->key_timer);
  	evtimer_set(&tty->key_timer, tty_keys_callback, tty);